-
本工具不已盈利为目的，只为交流学习，咨询请关注公众号【程序员小富】
+
本工具不已盈利为目的，只为交流学习，咨询请关注公众号【程序员内点事】
diff --git a/springboot101/redis/springboot-aop-redis-lua/.gitignore b/springboot-global-formatting/.gitignore
similarity index 100%
rename from springboot101/redis/springboot-aop-redis-lua/.gitignore
rename to springboot-global-formatting/.gitignore
diff --git a/springboot-global-formatting/mvnw b/springboot-global-formatting/mvnw
new file mode 100644
index 00000000..a16b5431
--- /dev/null
+++ b/springboot-global-formatting/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ 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
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springboot-global-formatting/mvnw.cmd b/springboot-global-formatting/mvnw.cmd
new file mode 100644
index 00000000..c8d43372
--- /dev/null
+++ b/springboot-global-formatting/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springboot-global-formatting/pom.xml b/springboot-global-formatting/pom.xml
new file mode 100644
index 00000000..b2046883
--- /dev/null
+++ b/springboot-global-formatting/pom.xml
@@ -0,0 +1,68 @@
+
+
+ 4.0.0
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.0.5.RELEASE
+
+ com.xiaofu.formatting
+ springboot-global-formatting
+ 0.0.1-SNAPSHOT
+ springboot-global-formatting
+ Demo project for Spring Boot
+
+
+ 1.8
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+ 2.0.5.RELEASE
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
+
+ org.projectlombok
+ lombok
+ 1.16.18
+ provided
+
+
+
+ com.alibaba
+ fastjson
+ 1.2.49
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/SpringbootGlobalFormattingApplication.java" b/springboot-global-formatting/src/main/java/com/xiaofu/formatting/SpringbootGlobalFormattingApplication.java
similarity index 91%
rename from "springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/SpringbootGlobalFormattingApplication.java"
rename to springboot-global-formatting/src/main/java/com/xiaofu/formatting/SpringbootGlobalFormattingApplication.java
index a9080cef..4a7eed48 100644
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/SpringbootGlobalFormattingApplication.java"
+++ b/springboot-global-formatting/src/main/java/com/xiaofu/formatting/SpringbootGlobalFormattingApplication.java
@@ -1,4 +1,4 @@
-package com.springboot101;
+package com.xiaofu.formatting;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/config/DateFormatConfig1.java" b/springboot-global-formatting/src/main/java/com/xiaofu/formatting/config/DateFormatConfig1.java
similarity index 93%
rename from "springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/config/DateFormatConfig1.java"
rename to springboot-global-formatting/src/main/java/com/xiaofu/formatting/config/DateFormatConfig1.java
index 370b0492..d98e257c 100644
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/config/DateFormatConfig1.java"
+++ b/springboot-global-formatting/src/main/java/com/xiaofu/formatting/config/DateFormatConfig1.java
@@ -1,4 +1,4 @@
-//package com.springboot101.formatting.config;
+//package com.xiaofu.formatting.config;
//
//
//import com.fasterxml.jackson.databind.SerializationFeature;
@@ -24,7 +24,7 @@
// private String pattern;
//
// /**
-// * @author 公众号：程序员小富
+// * @author xiaofu
// * @description date 类型全局时间格式化
// * @date 2020/8/31 18:22
// */
@@ -43,7 +43,7 @@
// }
//
// /**
-// * @author 公众号：程序员小富
+// * @author xiaofu
// * @description LocalDate 类型全局时间格式化
// * @date 2020/8/31 18:22
// */
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/config/DateFormatConfig2.java" b/springboot-global-formatting/src/main/java/com/xiaofu/formatting/config/DateFormatConfig2.java
similarity index 94%
rename from "springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/config/DateFormatConfig2.java"
rename to springboot-global-formatting/src/main/java/com/xiaofu/formatting/config/DateFormatConfig2.java
index e811c554..bb62cd4f 100644
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/config/DateFormatConfig2.java"
+++ b/springboot-global-formatting/src/main/java/com/xiaofu/formatting/config/DateFormatConfig2.java
@@ -1,4 +1,4 @@
-package com.springboot101.config;
+package com.xiaofu.formatting.config;
import com.fasterxml.jackson.core.JsonGenerator;
@@ -42,7 +42,7 @@ public ObjectMapper serializingObjectMapper() {
}
/**
- * @author 公众号：程序员小富
+ * @author xiaofu
* @description Date 时间类型装换
* @date 2020/9/1 17:25
*/
@@ -56,7 +56,7 @@ public void serialize(Date date, JsonGenerator gen, SerializerProvider provider)
}
/**
- * @author 公众号：程序员小富
+ * @author xiaofu
* @description Date 时间类型装换
* @date 2020/9/1 17:25
*/
@@ -74,7 +74,7 @@ public Date deserialize(JsonParser jsonParser, DeserializationContext deserializ
}
/**
- * @author 公众号：程序员小富
+ * @author xiaofu
* @description LocalDate 时间类型装换
* @date 2020/9/1 17:25
*/
@@ -86,7 +86,7 @@ public void serialize(LocalDateTime value, JsonGenerator gen, SerializerProvider
}
/**
- * @author 公众号：程序员小富
+ * @author xiaofu
* @description LocalDate 时间类型装换
* @date 2020/9/1 17:25
*/
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/controller/GlobalFormattingTimeController.java" b/springboot-global-formatting/src/main/java/com/xiaofu/formatting/controller/GlobalFormattingTimeController.java
similarity index 84%
rename from "springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/controller/GlobalFormattingTimeController.java"
rename to springboot-global-formatting/src/main/java/com/xiaofu/formatting/controller/GlobalFormattingTimeController.java
index 910db981..76d85208 100644
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/controller/GlobalFormattingTimeController.java"
+++ b/springboot-global-formatting/src/main/java/com/xiaofu/formatting/controller/GlobalFormattingTimeController.java
@@ -1,7 +1,7 @@
-package com.springboot101.controller;
+package com.xiaofu.formatting.controller;
import com.alibaba.fastjson.JSON;
-import com.springboot101.dto.OrderDTO;
+import com.xiaofu.formatting.dto.OrderDTO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -10,7 +10,7 @@
import java.util.Date;
/**
- * @Author: 公众号：程序员小富
+ * @Author: xiaofu
* @Description:
*/
@Slf4j
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/dto/OrderDTO.java" b/springboot-global-formatting/src/main/java/com/xiaofu/formatting/dto/OrderDTO.java
similarity index 85%
rename from "springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/dto/OrderDTO.java"
rename to springboot-global-formatting/src/main/java/com/xiaofu/formatting/dto/OrderDTO.java
index ddb85c09..76de241f 100644
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/java/com/springboot101/dto/OrderDTO.java"
+++ b/springboot-global-formatting/src/main/java/com/xiaofu/formatting/dto/OrderDTO.java
@@ -1,4 +1,4 @@
-package com.springboot101.dto;
+package com.xiaofu.formatting.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -7,7 +7,7 @@
import java.util.Date;
/**
- * @Author: 公众号：程序员小富
+ * @Author: xiaofu
* @Description:
*/
@Data
diff --git a/springboot-global-formatting/src/main/resources/application.properties b/springboot-global-formatting/src/main/resources/application.properties
new file mode 100644
index 00000000..e69de29b
diff --git a/springboot101/redis/springboot-redisson-lock/.gitignore b/springboot-mqtt-messagepush/.gitignore
similarity index 100%
rename from springboot101/redis/springboot-redisson-lock/.gitignore
rename to springboot-mqtt-messagepush/.gitignore
diff --git a/springboot-mqtt-messagepush/mvnw b/springboot-mqtt-messagepush/mvnw
new file mode 100644
index 00000000..a16b5431
--- /dev/null
+++ b/springboot-mqtt-messagepush/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ 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
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springboot-mqtt-messagepush/mvnw.cmd b/springboot-mqtt-messagepush/mvnw.cmd
new file mode 100644
index 00000000..c8d43372
--- /dev/null
+++ b/springboot-mqtt-messagepush/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springboot-mqtt-messagepush/pom.xml b/springboot-mqtt-messagepush/pom.xml
new file mode 100644
index 00000000..b3dcd666
--- /dev/null
+++ b/springboot-mqtt-messagepush/pom.xml
@@ -0,0 +1,92 @@
+
+
+ 4.0.0
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.0.5.RELEASE
+
+ com.xiaofu
+ springboot-mqtt-messagepush
+ 0.0.1-SNAPSHOT
+ springboot-mqtt-messagepush
+ springboot-mqtt-messagepush
+
+
+ 1.8
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-thymeleaf
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+ 2.0.5.RELEASE
+
+
+
+ org.springframework.boot
+ spring-boot-starter-amqp
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-amqp
+
+
+
+ org.projectlombok
+ lombok
+ 1.16.18
+ provided
+
+
+
+
+ org.springframework.integration
+ spring-integration-mqtt
+
+
+ org.eclipse.paho
+ org.eclipse.paho.client.mqttv3
+ 1.2.0
+
+
+
+ org.springframework.boot
+ spring-boot-starter-amqp
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/SpringbootMqttMessagepushApplication.java b/springboot-mqtt-messagepush/src/main/java/com/mqtt/SpringbootMqttMessagepushApplication.java
similarity index 92%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/SpringbootMqttMessagepushApplication.java
rename to springboot-mqtt-messagepush/src/main/java/com/mqtt/SpringbootMqttMessagepushApplication.java
index c97d2aad..b00535f0 100644
--- a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/SpringbootMqttMessagepushApplication.java
+++ b/springboot-mqtt-messagepush/src/main/java/com/mqtt/SpringbootMqttMessagepushApplication.java
@@ -1,4 +1,4 @@
-package com.springboot101;
+package com.mqtt;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/config/IotMqttProducerConfig.java b/springboot-mqtt-messagepush/src/main/java/com/mqtt/config/IotMqttProducerConfig.java
similarity index 92%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/config/IotMqttProducerConfig.java
rename to springboot-mqtt-messagepush/src/main/java/com/mqtt/config/IotMqttProducerConfig.java
index b0b7c3bd..0d0d5d45 100644
--- a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/config/IotMqttProducerConfig.java
+++ b/springboot-mqtt-messagepush/src/main/java/com/mqtt/config/IotMqttProducerConfig.java
@@ -1,4 +1,4 @@
-package com.springboot101.config;
+package com.mqtt.config;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -12,7 +12,7 @@
import org.springframework.messaging.MessageHandler;
/**
- * @Author: 程序员小富
+ * @Author: xinzhifu
* @Description:
*/
@Configuration
@@ -24,7 +24,7 @@ public class IotMqttProducerConfig {
@Bean
public MqttPahoClientFactory mqttClientFactory() {
DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
-// factory.setServerURIs(mqttConfig.getServers());
+ factory.setServerURIs(mqttConfig.getServers());
return factory;
}
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/config/IotMqttSubscriberConfig.java b/springboot-mqtt-messagepush/src/main/java/com/mqtt/config/IotMqttSubscriberConfig.java
similarity index 96%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/config/IotMqttSubscriberConfig.java
rename to springboot-mqtt-messagepush/src/main/java/com/mqtt/config/IotMqttSubscriberConfig.java
index eec12a8f..2411573b 100644
--- a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/config/IotMqttSubscriberConfig.java
+++ b/springboot-mqtt-messagepush/src/main/java/com/mqtt/config/IotMqttSubscriberConfig.java
@@ -15,7 +15,7 @@
//import org.springframework.messaging.MessagingException;
//
///**
-// * @Author: 公众号：程序员小富
+// * @Author: xiaofu
// * @Description: 消息订阅配置
// * @date 2020/6/8 18:24
// */
@@ -48,7 +48,7 @@
// }
//
// /**
-// * @author 公众号：程序员小富
+// * @author xiaofu
// * @description 消息订阅
// * @date 2020/6/8 18:20
// */
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/config/MqttConfig.java b/springboot-mqtt-messagepush/src/main/java/com/mqtt/config/MqttConfig.java
similarity index 91%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/config/MqttConfig.java
rename to springboot-mqtt-messagepush/src/main/java/com/mqtt/config/MqttConfig.java
index 128f8eb4..77931329 100644
--- a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/config/MqttConfig.java
+++ b/springboot-mqtt-messagepush/src/main/java/com/mqtt/config/MqttConfig.java
@@ -1,4 +1,4 @@
-package com.springboot101.config;
+package com.mqtt.config;
import lombok.Getter;
import lombok.Setter;
@@ -7,7 +7,7 @@
import org.springframework.stereotype.Component;
/**
- * @Author: 程序员小富
+ * @Author: xinzhifu
* @Description: 基础配置类
* @date 2020/6/8 18:25
*/
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/producer/IotMqttController.java b/springboot-mqtt-messagepush/src/main/java/com/mqtt/producer/IotMqttController.java
similarity index 91%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/producer/IotMqttController.java
rename to springboot-mqtt-messagepush/src/main/java/com/mqtt/producer/IotMqttController.java
index ca46615a..fc423a25 100644
--- a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/producer/IotMqttController.java
+++ b/springboot-mqtt-messagepush/src/main/java/com/mqtt/producer/IotMqttController.java
@@ -1,4 +1,4 @@
-package com.springboot101.producer;
+package com.mqtt.producer;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,7 +8,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
/**
- * @Author: 公众号：程序员小富
+ * @Author: xiaofu
* @Description:
* @date 2020/6/8 18:26
*/
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/producer/IotMqttGateway.java b/springboot-mqtt-messagepush/src/main/java/com/mqtt/producer/IotMqttGateway.java
similarity index 89%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/producer/IotMqttGateway.java
rename to springboot-mqtt-messagepush/src/main/java/com/mqtt/producer/IotMqttGateway.java
index cb44e828..906da84b 100644
--- a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/java/com/springboot101/producer/IotMqttGateway.java
+++ b/springboot-mqtt-messagepush/src/main/java/com/mqtt/producer/IotMqttGateway.java
@@ -1,11 +1,11 @@
-package com.springboot101.producer;
+package com.mqtt.producer;
import org.springframework.integration.annotation.MessagingGateway;
import org.springframework.integration.mqtt.support.MqttHeaders;
import org.springframework.messaging.handler.annotation.Header;
/**
- * @author 公众号：程序员小富
+ * @author xiaofu
* @description rabbitmq mqtt协议网关接口
* @date 2020/6/8 18:26
*/
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/application.yml b/springboot-mqtt-messagepush/src/main/resources/application.yml
similarity index 100%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/application.yml
rename to springboot-mqtt-messagepush/src/main/resources/application.yml
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/static/push.css b/springboot-mqtt-messagepush/src/main/resources/static/css/push.css
similarity index 100%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/static/push.css
rename to springboot-mqtt-messagepush/src/main/resources/static/css/push.css
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/static/style.css b/springboot-mqtt-messagepush/src/main/resources/static/css/style.css
similarity index 100%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/static/style.css
rename to springboot-mqtt-messagepush/src/main/resources/static/css/style.css
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/js/follow.js" b/springboot-mqtt-messagepush/src/main/resources/static/js/follow.js
similarity index 100%
rename from "springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/js/follow.js"
rename to springboot-mqtt-messagepush/src/main/resources/static/js/follow.js
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/static/js/gg_bd_ad_720x90-2.js b/springboot-mqtt-messagepush/src/main/resources/static/js/gg_bd_ad_720x90-2.js
similarity index 100%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/static/js/gg_bd_ad_720x90-2.js
rename to springboot-mqtt-messagepush/src/main/resources/static/js/gg_bd_ad_720x90-2.js
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/static/js/gg_bd_ad_720x90.js b/springboot-mqtt-messagepush/src/main/resources/static/js/gg_bd_ad_720x90.js
similarity index 100%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/static/js/gg_bd_ad_720x90.js
rename to springboot-mqtt-messagepush/src/main/resources/static/js/gg_bd_ad_720x90.js
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/js/index.js" b/springboot-mqtt-messagepush/src/main/resources/static/js/index.js
similarity index 100%
rename from "springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/js/index.js"
rename to springboot-mqtt-messagepush/src/main/resources/static/js/index.js
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/js/vue.min.js" b/springboot-mqtt-messagepush/src/main/resources/static/vue.min.js
similarity index 100%
rename from "springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/js/vue.min.js"
rename to springboot-mqtt-messagepush/src/main/resources/static/vue.min.js
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/templates/1.html b/springboot-mqtt-messagepush/src/main/resources/templates/1.html
similarity index 100%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/templates/1.html
rename to springboot-mqtt-messagepush/src/main/resources/templates/1.html
diff --git a/springboot-mqtt-messagepush/src/main/resources/templates/2.html b/springboot-mqtt-messagepush/src/main/resources/templates/2.html
new file mode 100644
index 00000000..e69de29b
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/templates/index.html b/springboot-mqtt-messagepush/src/main/resources/templates/index.html
similarity index 94%
rename from springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/templates/index.html
rename to springboot-mqtt-messagepush/src/main/resources/templates/index.html
index b3ec78b1..9a6b0988 100644
--- a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/templates/index.html
+++ b/springboot-mqtt-messagepush/src/main/resources/templates/index.html
@@ -7,10 +7,10 @@
-
+
-
-
+
+
diff --git a/springboot-rabbitmq-confirm/.mvn/wrapper/MavenWrapperDownloader.java b/springboot-rabbitmq-confirm/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 00000000..e76d1f32
--- /dev/null
+++ b/springboot-rabbitmq-confirm/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ private static final String WRAPPER_VERSION = "0.5.6";
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if(mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if(mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if(!outputFile.getParentFile().exists()) {
+ if(!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+ String username = System.getenv("MVNW_USERNAME");
+ char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+ });
+ }
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/springboot-rabbitmq-confirm/.mvn/wrapper/maven-wrapper.jar b/springboot-rabbitmq-confirm/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 00000000..2cc7d4a5
Binary files /dev/null and b/springboot-rabbitmq-confirm/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/springboot-rabbitmq-confirm/.mvn/wrapper/maven-wrapper.properties b/springboot-rabbitmq-confirm/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 00000000..642d572c
--- /dev/null
+++ b/springboot-rabbitmq-confirm/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/springboot-rabbitmq-confirm/HELP.md b/springboot-rabbitmq-confirm/HELP.md
new file mode 100644
index 00000000..8b853c16
--- /dev/null
+++ b/springboot-rabbitmq-confirm/HELP.md
@@ -0,0 +1,20 @@
+# Getting Started
+
+### Reference Documentation
+For further reference, please consider the following sections:
+
+* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html)
+* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.2.8.RELEASE/maven-plugin/)
+* [Thymeleaf](https://docs.spring.io/spring-boot/docs/2.3.1.RELEASE/reference/htmlsingle/#boot-features-spring-mvc-template-engines)
+* [Spring Web](https://docs.spring.io/spring-boot/docs/2.3.1.RELEASE/reference/htmlsingle/#boot-features-developing-web-applications)
+* [Spring for RabbitMQ](https://docs.spring.io/spring-boot/docs/2.3.1.RELEASE/reference/htmlsingle/#boot-features-amqp)
+
+### Guides
+The following guides illustrate how to use some features concretely:
+
+* [Handling Form Submission](https://spring.io/guides/gs/handling-form-submission/)
+* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/)
+* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/)
+* [Building REST services with Spring](https://spring.io/guides/tutorials/bookmarks/)
+* [Messaging with RabbitMQ](https://spring.io/guides/gs/messaging-rabbitmq/)
+
diff --git a/springboot-rabbitmq-confirm/mvnw b/springboot-rabbitmq-confirm/mvnw
new file mode 100644
index 00000000..a16b5431
--- /dev/null
+++ b/springboot-rabbitmq-confirm/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ 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
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springboot-rabbitmq-confirm/mvnw.cmd b/springboot-rabbitmq-confirm/mvnw.cmd
new file mode 100644
index 00000000..c8d43372
--- /dev/null
+++ b/springboot-rabbitmq-confirm/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springboot-rabbitmq-confirm/pom.xml b/springboot-rabbitmq-confirm/pom.xml
new file mode 100644
index 00000000..ac1a9f86
--- /dev/null
+++ b/springboot-rabbitmq-confirm/pom.xml
@@ -0,0 +1,74 @@
+
+
+ 4.0.0
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.0.5.RELEASE
+
+ com.xiaofu
+ springboot-rabbitmq-confirm
+ 0.0.1-SNAPSHOT
+ springboot-rabbitmq-confirm
+ Demo project for Spring Boot
+
+
+ 1.8
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-thymeleaf
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-amqp
+
+
+
+ com.alibaba
+ fastjson
+ 1.2.49
+
+
+
+
+ org.projectlombok
+ lombok
+ 1.16.18
+ provided
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
diff --git a/springboot-rabbitmq-confirm/springboot-rabbitmq-confirm.iml b/springboot-rabbitmq-confirm/springboot-rabbitmq-confirm.iml
new file mode 100644
index 00000000..a02ec2ab
--- /dev/null
+++ b/springboot-rabbitmq-confirm/springboot-rabbitmq-confirm.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/SpringbootRabbitmqConfirmApplication.java b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/SpringbootRabbitmqConfirmApplication.java
similarity index 90%
rename from springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/SpringbootRabbitmqConfirmApplication.java
rename to springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/SpringbootRabbitmqConfirmApplication.java
index e9ad57de..7900dc70 100644
--- a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/SpringbootRabbitmqConfirmApplication.java
+++ b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/SpringbootRabbitmqConfirmApplication.java
@@ -1,4 +1,4 @@
-package com.springboot101.confirm;
+package com.xiaofu.confirm;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/callback/ConfirmCallbackService.java b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/callback/ConfirmCallbackService.java
similarity index 83%
rename from springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/callback/ConfirmCallbackService.java
rename to springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/callback/ConfirmCallbackService.java
index bd9f67af..2897489f 100644
--- a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/callback/ConfirmCallbackService.java
+++ b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/callback/ConfirmCallbackService.java
@@ -1,8 +1,8 @@
-package com.springboot101.confirm.callback;
+package com.xiaofu.confirm.callback;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.connection.CorrelationData;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.rabbit.support.CorrelationData;
import org.springframework.stereotype.Component;
@Slf4j
diff --git a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/callback/ReturnCallbackService.java b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/callback/ReturnCallbackService.java
similarity index 87%
rename from springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/callback/ReturnCallbackService.java
rename to springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/callback/ReturnCallbackService.java
index 9dd297cf..89a8fd5b 100644
--- a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/callback/ReturnCallbackService.java
+++ b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/callback/ReturnCallbackService.java
@@ -1,4 +1,4 @@
-package com.springboot101.confirm.callback;
+package com.xiaofu.confirm.callback;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.Message;
@@ -6,7 +6,7 @@
import org.springframework.stereotype.Component;
/**
- * @Author: 公众号：程序员小富
+ * @Author: xiaofu
* @Description:
*/
@Slf4j
diff --git a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/config/QueueConfig.java b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/config/QueueConfig.java
similarity index 96%
rename from springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/config/QueueConfig.java
rename to springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/config/QueueConfig.java
index a8578aa5..f5ab8c8f 100644
--- a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/config/QueueConfig.java
+++ b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/config/QueueConfig.java
@@ -1,4 +1,4 @@
-package com.springboot101.confirm.config;
+package com.xiaofu.confirm.config;
import org.springframework.amqp.core.Binding;
import org.springframework.amqp.core.BindingBuilder;
diff --git a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/controller/TestController.java b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/controller/TestController.java
similarity index 84%
rename from springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/controller/TestController.java
rename to springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/controller/TestController.java
index 0e76af88..0699f791 100644
--- a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/controller/TestController.java
+++ b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/controller/TestController.java
@@ -1,6 +1,6 @@
-package com.springboot101.confirm.controller;
+package com.xiaofu.confirm.controller;
-import com.springboot101.confirm.sender.SendMessage;
+import com.xiaofu.confirm.sender.SendMessage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -8,7 +8,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
/**
- * @Author: 公众号：程序员小富
+ * @Author: xiaofu
* @Description:
*/
@Controller
diff --git a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/receiver/ReceiverMessage.java b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/receiver/ReceiverMessage.java
similarity index 94%
rename from springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/receiver/ReceiverMessage.java
rename to springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/receiver/ReceiverMessage.java
index bf664a1d..1796bb19 100644
--- a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/receiver/ReceiverMessage.java
+++ b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/receiver/ReceiverMessage.java
@@ -1,4 +1,4 @@
-package com.springboot101.confirm.receiver;
+package com.xiaofu.confirm.receiver;
import com.rabbitmq.client.Channel;
import lombok.extern.slf4j.Slf4j;
@@ -10,7 +10,7 @@
import java.io.IOException;
/**
- * @author 公众号：程序员小富
+ * @author xiaofu
* @description 消息消费
* @date 2020/6/29 16:31
*/
diff --git a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/receiver/ReceiverMessage1.java b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/receiver/ReceiverMessage1.java
similarity index 91%
rename from springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/receiver/ReceiverMessage1.java
rename to springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/receiver/ReceiverMessage1.java
index 7c53cb56..c39583e7 100644
--- a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/receiver/ReceiverMessage1.java
+++ b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/receiver/ReceiverMessage1.java
@@ -1,17 +1,17 @@
-package com.springboot101.confirm.receiver;
+package com.xiaofu.confirm.receiver;
import com.rabbitmq.client.Channel;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.RabbitHandler;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.amqp.rabbit.connection.CorrelationData;
+import org.springframework.amqp.rabbit.support.CorrelationData;
import org.springframework.stereotype.Component;
import java.io.IOException;
/**
- * @Author: 公众号：程序员小富
+ * @Author: xiaofu
* @Description:
*/
@Slf4j
diff --git a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/sender/SendMessage.java b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/sender/SendMessage.java
similarity index 84%
rename from springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/sender/SendMessage.java
rename to springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/sender/SendMessage.java
index 6b9394a1..ce728b5b 100644
--- a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/java/com/springboot101/confirm/sender/SendMessage.java
+++ b/springboot-rabbitmq-confirm/src/main/java/com/xiaofu/confirm/sender/SendMessage.java
@@ -1,18 +1,18 @@
-package com.springboot101.confirm.sender;
+package com.xiaofu.confirm.sender;
-import com.springboot101.confirm.callback.ConfirmCallbackService;
-import com.springboot101.confirm.callback.ReturnCallbackService;
+import com.xiaofu.confirm.callback.ConfirmCallbackService;
+import com.xiaofu.confirm.callback.ReturnCallbackService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.core.MessageDeliveryMode;
-import org.springframework.amqp.rabbit.connection.CorrelationData;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.rabbit.support.CorrelationData;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.UUID;
/**
- * @Author: 公众号：程序员小富
+ * @Author: xiaofu
* @Description:
*/
@Slf4j
@@ -32,7 +32,7 @@ public class SendMessage {
* @param exchange 交换机
* @param routingKey 队列
* @param msg 消息体
- * @author 公众号：程序员小富
+ * @author xiaofu
* @description 发送消息
* @date 2020/6/29 16:22
*/
diff --git a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/resources/application.properties b/springboot-rabbitmq-confirm/src/main/resources/application.properties
similarity index 76%
rename from springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/resources/application.properties
rename to springboot-rabbitmq-confirm/src/main/resources/application.properties
index 755e33a7..adfc09f8 100644
--- a/springboot101/rabbitmq/springboot-rabbitmq-confirm/src/main/resources/application.properties
+++ b/springboot-rabbitmq-confirm/src/main/resources/application.properties
@@ -2,14 +2,20 @@ spring.rabbitmq.host=127.0.0.1
spring.rabbitmq.port=5672
spring.rabbitmq.username=guest
spring.rabbitmq.password=guest
-####################################################
+
+# ߿ confirm ȷϻ
spring.rabbitmq.publisher-confirms=true
+# return ȷϻ
spring.rabbitmq.publisher-returns=true
+
####################################################
+
+# Ѷ˿ack ֶӦ
spring.rabbitmq.listener.simple.acknowledge-mode=manual
+# Ƿ֧
spring.rabbitmq.listener.simple.retry.enabled=true
+# ָС
#spring.rabbitmq.listener.simple.concurrency=1
+#ָ
#spring.rabbitmq.listener.simple.max-concurrency=1
-
-
diff --git a/springboot-rabbitmq-mqtt/.idea/checkstyle-idea.xml b/springboot-rabbitmq-mqtt/.idea/checkstyle-idea.xml
new file mode 100644
index 00000000..034029da
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/checkstyle-idea.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/compiler.xml" b/springboot-rabbitmq-mqtt/.idea/compiler.xml
similarity index 74%
rename from "springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/compiler.xml"
rename to springboot-rabbitmq-mqtt/.idea/compiler.xml
index 2f55cb63..8123f385 100644
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/compiler.xml"
+++ b/springboot-rabbitmq-mqtt/.idea/compiler.xml
@@ -2,14 +2,15 @@
-
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/encodings.xml b/springboot-rabbitmq-mqtt/.idea/encodings.xml
new file mode 100644
index 00000000..b26911bd
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/encodings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/inspectionProfiles/Project_Default.xml b/springboot-rabbitmq-mqtt/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000..6560a989
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/kotlinc.xml b/springboot-rabbitmq-mqtt/.idea/kotlinc.xml
new file mode 100644
index 00000000..1c24f9a8
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/kotlinc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
new file mode 100644
index 00000000..6fec8f43
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
new file mode 100644
index 00000000..9eb8596a
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml
new file mode 100644
index 00000000..33c30b4c
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_classmate_1_3_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml
new file mode 100644
index 00000000..06441f49
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml
new file mode 100644
index 00000000..eebe10dd
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml
new file mode 100644
index 00000000..51087da7
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml
new file mode 100644
index 00000000..fa50d959
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml
new file mode 100644
index 00000000..7e20e35f
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml
new file mode 100644
index 00000000..345adf83
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
new file mode 100644
index 00000000..f19f6eb3
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_4_1.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_4_1.xml
new file mode 100644
index 00000000..c14a72ec
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_rabbitmq_amqp_client_5_4_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
new file mode 100644
index 00000000..b8581a6f
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__io_projectreactor_reactor_core_3_1_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__io_projectreactor_reactor_core_3_1_9_RELEASE.xml
new file mode 100644
index 00000000..2087ee6a
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__io_projectreactor_reactor_core_3_1_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml
new file mode 100644
index 00000000..e74f3ab2
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
new file mode 100644
index 00000000..6978c0b2
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__junit_junit_4_12.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__junit_junit_4_12.xml
new file mode 100644
index 00000000..d4110417
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__junit_junit_4_12.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml
new file mode 100644
index 00000000..ee623f18
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_7_11.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml
new file mode 100644
index 00000000..a72c9a38
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_7_11.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
new file mode 100644
index 00000000..b3d38583
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
new file mode 100644
index 00000000..10830235
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml
new file mode 100644
index 00000000..cbe5ca7e
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_10_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml
new file mode 100644
index 00000000..1407c582
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_10_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_34.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_34.xml
new file mode 100644
index 00000000..cc36a163
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_8_5_34.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_34.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_34.xml
new file mode 100644
index 00000000..45668bd9
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_8_5_34.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_34.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_34.xml
new file mode 100644
index 00000000..18838400
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_8_5_34.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml
new file mode 100644
index 00000000..40adaaa0
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_assertj_assertj_core_3_9_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_attoparser_attoparser_2_0_4_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_attoparser_attoparser_2_0_4_RELEASE.xml
new file mode 100644
index 00000000..fab35d26
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_attoparser_attoparser_2_0_4_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_0.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_0.xml
new file mode 100644
index 00000000..4c81ce41
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_eclipse_paho_org_eclipse_paho_client_mqttv3_1_2_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
new file mode 100644
index 00000000..f58bbc11
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
new file mode 100644
index 00000000..78dbe458
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_12_Final.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_12_Final.xml
new file mode 100644
index 00000000..c0194310
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_12_Final.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml
new file mode 100644
index 00000000..5f7dd01e
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml
new file mode 100644
index 00000000..a742a6dd
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_mockito_mockito_core_2_15_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
new file mode 100644
index 00000000..af41e3b6
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
new file mode 100644
index 00000000..0bf8cf2b
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml
new file mode 100644
index 00000000..8503cb41
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_projectlombok_lombok_1_16_18.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml
new file mode 100644
index 00000000..457c7b78
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_reactivestreams_reactive_streams_1_0_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
new file mode 100644
index 00000000..c4c54d6d
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml
new file mode 100644
index 00000000..6073e533
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
new file mode 100644
index 00000000..20e81636
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_0_6_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_0_6_RELEASE.xml
new file mode 100644
index 00000000..e60dbc53
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_amqp_spring_amqp_2_0_6_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_0_6_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_0_6_RELEASE.xml
new file mode 100644
index 00000000..b6dc088e
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_amqp_spring_rabbit_2_0_6_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_5_RELEASE.xml
new file mode 100644
index 00000000..694ace04
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_0_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_5_RELEASE.xml
new file mode 100644
index 00000000..487c520a
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_0_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_5_RELEASE.xml
new file mode 100644
index 00000000..dc463240
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_0_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_0_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_0_5_RELEASE.xml
new file mode 100644
index 00000000..56b52f8e
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_amqp_2_0_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_5_RELEASE.xml
new file mode 100644
index 00000000..7e50280a
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_0_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_5_RELEASE.xml
new file mode 100644
index 00000000..af6c53d3
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_0_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_5_RELEASE.xml
new file mode 100644
index 00000000..0262995c
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_0_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_0_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_0_5_RELEASE.xml
new file mode 100644
index 00000000..c6f0e2e2
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_thymeleaf_2_0_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_5_RELEASE.xml
new file mode 100644
index 00000000..b75b9fc9
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_0_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_5_RELEASE.xml
new file mode 100644
index 00000000..454ee43e
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_0_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_5_RELEASE.xml
new file mode 100644
index 00000000..f2c363d0
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_0_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_5_RELEASE.xml
new file mode 100644
index 00000000..4c7f1e34
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_0_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_integration_spring_integration_core_5_0_8_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_integration_spring_integration_core_5_0_8_RELEASE.xml
new file mode 100644
index 00000000..b886b2cd
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_integration_spring_integration_core_5_0_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_integration_spring_integration_mqtt_5_0_8_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_integration_spring_integration_mqtt_5_0_8_RELEASE.xml
new file mode 100644
index 00000000..621253c7
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_integration_spring_integration_mqtt_5_0_8_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml
new file mode 100644
index 00000000..1b2836ba
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_2_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_aop_5_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_aop_5_0_9_RELEASE.xml
new file mode 100644
index 00000000..d72ff5a2
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_aop_5_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_beans_5_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_beans_5_0_9_RELEASE.xml
new file mode 100644
index 00000000..f606e1f0
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_beans_5_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_context_5_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_context_5_0_9_RELEASE.xml
new file mode 100644
index 00000000..1444af1b
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_context_5_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_core_5_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_core_5_0_9_RELEASE.xml
new file mode 100644
index 00000000..15a89a5a
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_core_5_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_expression_5_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_expression_5_0_9_RELEASE.xml
new file mode 100644
index 00000000..b5c312e9
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_expression_5_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_9_RELEASE.xml
new file mode 100644
index 00000000..847069e2
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_jcl_5_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_9_RELEASE.xml
new file mode 100644
index 00000000..4750da46
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_messaging_5_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_test_5_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_test_5_0_9_RELEASE.xml
new file mode 100644
index 00000000..22def702
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_test_5_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_tx_5_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_tx_5_0_9_RELEASE.xml
new file mode 100644
index 00000000..79735e2d
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_tx_5_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_web_5_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_web_5_0_9_RELEASE.xml
new file mode 100644
index 00000000..6700b123
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_web_5_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_9_RELEASE.xml
new file mode 100644
index 00000000..392a5f37
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_springframework_spring_webmvc_5_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_1_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_1_RELEASE.xml
new file mode 100644
index 00000000..73e2e089
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_thymeleaf_extras_thymeleaf_extras_java8time_3_0_1_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_9_RELEASE.xml
new file mode 100644
index 00000000..7d6a8ddf
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_thymeleaf_thymeleaf_3_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_9_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_9_RELEASE.xml
new file mode 100644
index 00000000..536ab741
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_thymeleaf_thymeleaf_spring5_3_0_9_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_unbescape_unbescape_1_1_5_RELEASE.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_unbescape_unbescape_1_1_5_RELEASE.xml
new file mode 100644
index 00000000..1649e753
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_unbescape_unbescape_1_1_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml
new file mode 100644
index 00000000..474c910c
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_5_1.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml
new file mode 100644
index 00000000..33ccf19e
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/libraries/Maven__org_yaml_snakeyaml_1_19.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/misc.xml b/springboot-rabbitmq-mqtt/.idea/misc.xml
new file mode 100644
index 00000000..0d36b021
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/misc.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ C:\Users\51536\AppData\Roaming\Subversion
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/modules.xml b/springboot-rabbitmq-mqtt/.idea/modules.xml
new file mode 100644
index 00000000..5572d5af
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/1/a/1a273f73b7a477b0745593641bd708a6182c7ad5 b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/1/a/1a273f73b7a477b0745593641bd708a6182c7ad5
new file mode 100644
index 00000000..e69de29b
diff --git a/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/2/5/25d058fd2f336b9b05b0fa19ce2574364d8b11e9 b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/2/5/25d058fd2f336b9b05b0fa19ce2574364d8b11e9
new file mode 100644
index 00000000..32fc04a5
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/2/5/25d058fd2f336b9b05b0fa19ce2574364d8b11e9
@@ -0,0 +1,2 @@
+
+\ squid:S3752">Add a "method" parameter to this "@RequestMapping" annotation.(8.
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/4/4/442292b8a7efeabbe4cc176709b833b1792140ec b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/4/4/442292b8a7efeabbe4cc176709b833b1792140ec
new file mode 100644
index 00000000..e69de29b
diff --git a/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/4/5/4575f60e1d03f4627d4f6840b590732ad432d58a b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/4/5/4575f60e1d03f4627d4f6840b590732ad432d58a
new file mode 100644
index 00000000..2e334e2f
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/4/5/4575f60e1d03f4627d4f6840b590732ad432d58a
@@ -0,0 +1,4 @@
+
+isquid:CommentedOutCodeLine@"
"9Replace this use of System.out or System.err by a logger.(Җ8ũ.
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/5/d/5d7c1005ad9752e7dd586c0581cba2ae87a9da93 b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/5/d/5d7c1005ad9752e7dd586c0581cba2ae87a9da93
new file mode 100644
index 00000000..e69de29b
diff --git a/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/7/8/7877f99068a16e721bb87b635c309ae44ebb0272 b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/7/8/7877f99068a16e721bb87b635c309ae44ebb0272
new file mode 100644
index 00000000..e69de29b
diff --git a/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/7/9/796815f6e937ee5fbd6473bae31535433650f7a9 b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/7/9/796815f6e937ee5fbd6473bae31535433650f7a9
new file mode 100644
index 00000000..e69de29b
diff --git a/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/a/6/a6d854e414ee26462f0534f82544fc2f8d7a3ec2 b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/a/6/a6d854e414ee26462f0534f82544fc2f8d7a3ec2
new file mode 100644
index 00000000..e69de29b
diff --git a/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/a/6/a6d8b8556fee0e03112ce2bf34b8cb27a7dc9e58 b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/a/6/a6d8b8556fee0e03112ce2bf34b8cb27a7dc9e58
new file mode 100644
index 00000000..e69de29b
diff --git a/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/d/9/d94f5e0242757f21cdd903d48f1167f397cf7e42 b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/d/9/d94f5e0242757f21cdd903d48f1167f397cf7e42
new file mode 100644
index 00000000..c3e7e1aa
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/d/9/d94f5e0242757f21cdd903d48f1167f397cf7e42
@@ -0,0 +1,7 @@
+
+V
+squid:S106"9Replace this use of System.out or System.err by a logger.(8.
+e squid:S00101 "MRename this class name to match the regular expression '^[A-Z][a-zA-Z0-9]*$'.(
+ squid:S1186"Add a nested comment explaining why this method is empty, throw an UnsupportedOperationException or complete the implementation.(8.
+[
+squid:S106"9Replace this use of System.out or System.err by a logger.(Э8.
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/f/0/f05902c6e4cae11d94dd05078037f4697db5dbe5 b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/f/0/f05902c6e4cae11d94dd05078037f4697db5dbe5
new file mode 100644
index 00000000..e69de29b
diff --git a/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/index.pb b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/index.pb
new file mode 100644
index 00000000..7b6b52af
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/sonarlint/issuestore/index.pb
@@ -0,0 +1,23 @@
+
+7
+pom.xml,4\4\442292b8a7efeabbe4cc176709b833b1792140ec
+]
+-src/main/java/com/iot/mqtt/producer/call.java,d\9\d94f5e0242757f21cdd903d48f1167f397cf7e42
+q
+Asrc/main/java/com/iot/mqtt/SpringbootRabbitmqMqttApplication.java,f\0\f05902c6e4cae11d94dd05078037f4697db5dbe5
+a
+1src/main/java/com/iot/mqtt/config/MqttConfig.java,7\8\7877f99068a16e721bb87b635c309ae44ebb0272
+j
+:src/main/java/com/iot/mqtt/producer/IotMqttController.java,2\5\25d058fd2f336b9b05b0fa19ce2574364d8b11e9
+n
+>src/main/java/com/iot/mqtt/config/IotMqttSubscriberConfig.java,4\5\4575f60e1d03f4627d4f6840b590732ad432d58a
+l
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-demo/.idea/uiDesigner.xml b/springboot-rabbitmq-mqtt/.idea/uiDesigner.xml
similarity index 80%
rename from springboot-demo/.idea/uiDesigner.xml
rename to springboot-rabbitmq-mqtt/.idea/uiDesigner.xml
index 2b63946d..e96534fb 100644
--- a/springboot-demo/.idea/uiDesigner.xml
+++ b/springboot-rabbitmq-mqtt/.idea/uiDesigner.xml
@@ -2,121 +2,121 @@
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
- -
+
-
diff --git a/springboot-rabbitmq-mqtt/.idea/vcs.xml b/springboot-rabbitmq-mqtt/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.idea/workspace.xml b/springboot-rabbitmq-mqtt/.idea/workspace.xml
new file mode 100644
index 00000000..a0db3c5a
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.idea/workspace.xml
@@ -0,0 +1,1434 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ mqtt.producer.servers
+ mqttTestInputChannel
+ mqttOutboundChannel
+ @ComponentScan
+ inbound
+ clientId
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ DEFINITION_ORDER
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ project
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1591352849873
+ 1591352849873
+
+
+ 1592703515948
+ 1592703515948
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Spring
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.8
+
+
+
+
+
+
+
+
+
+
+ springboot-rabbitmq-mqtt
+
+
+
+
+
+
+
+
+
+
+ 1.8
+
+
+
+
+
+
+
+
+
+
+ Maven: ch.qos.logback:logback-classic:1.2.3
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-rabbitmq-mqtt/.mvn/wrapper/MavenWrapperDownloader.java b/springboot-rabbitmq-mqtt/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 00000000..e76d1f32
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+ private static final String WRAPPER_VERSION = "0.5.6";
+ /**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+ */
+ private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+ /**
+ * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+ * use instead of the default one.
+ */
+ private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+ ".mvn/wrapper/maven-wrapper.properties";
+
+ /**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+ private static final String MAVEN_WRAPPER_JAR_PATH =
+ ".mvn/wrapper/maven-wrapper.jar";
+
+ /**
+ * Name of the property which should be used to override the default download url for the wrapper.
+ */
+ private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+ public static void main(String args[]) {
+ System.out.println("- Downloader started");
+ File baseDirectory = new File(args[0]);
+ System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+ // If the maven-wrapper.properties exists, read it and check if it contains a custom
+ // wrapperUrl parameter.
+ File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+ String url = DEFAULT_DOWNLOAD_URL;
+ if(mavenWrapperPropertyFile.exists()) {
+ FileInputStream mavenWrapperPropertyFileInputStream = null;
+ try {
+ mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+ Properties mavenWrapperProperties = new Properties();
+ mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+ url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+ } catch (IOException e) {
+ System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+ } finally {
+ try {
+ if(mavenWrapperPropertyFileInputStream != null) {
+ mavenWrapperPropertyFileInputStream.close();
+ }
+ } catch (IOException e) {
+ // Ignore ...
+ }
+ }
+ }
+ System.out.println("- Downloading from: " + url);
+
+ File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+ if(!outputFile.getParentFile().exists()) {
+ if(!outputFile.getParentFile().mkdirs()) {
+ System.out.println(
+ "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+ }
+ }
+ System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+ try {
+ downloadFileFromURL(url, outputFile);
+ System.out.println("Done");
+ System.exit(0);
+ } catch (Throwable e) {
+ System.out.println("- Error downloading");
+ e.printStackTrace();
+ System.exit(1);
+ }
+ }
+
+ private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+ if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+ String username = System.getenv("MVNW_USERNAME");
+ char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+ Authenticator.setDefault(new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ return new PasswordAuthentication(username, password);
+ }
+ });
+ }
+ URL website = new URL(urlString);
+ ReadableByteChannel rbc;
+ rbc = Channels.newChannel(website.openStream());
+ FileOutputStream fos = new FileOutputStream(destination);
+ fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+ fos.close();
+ rbc.close();
+ }
+
+}
diff --git a/springboot-rabbitmq-mqtt/.mvn/wrapper/maven-wrapper.jar b/springboot-rabbitmq-mqtt/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 00000000..2cc7d4a5
Binary files /dev/null and b/springboot-rabbitmq-mqtt/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/springboot-rabbitmq-mqtt/.mvn/wrapper/maven-wrapper.properties b/springboot-rabbitmq-mqtt/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 00000000..642d572c
--- /dev/null
+++ b/springboot-rabbitmq-mqtt/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/.gitignore" b/springboot-redisson-lock/.gitignore
similarity index 100%
rename from "springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/.gitignore"
rename to springboot-redisson-lock/.gitignore
diff --git a/springboot-redisson-lock/mvnw b/springboot-redisson-lock/mvnw
new file mode 100644
index 00000000..a16b5431
--- /dev/null
+++ b/springboot-redisson-lock/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ 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
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springboot-redisson-lock/mvnw.cmd b/springboot-redisson-lock/mvnw.cmd
new file mode 100644
index 00000000..c8d43372
--- /dev/null
+++ b/springboot-redisson-lock/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springboot-redisson-lock/pom.xml b/springboot-redisson-lock/pom.xml
new file mode 100644
index 00000000..6b72424a
--- /dev/null
+++ b/springboot-redisson-lock/pom.xml
@@ -0,0 +1,69 @@
+
+
+ 4.0.0
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.2.5.RELEASE
+
+ com.chengxy
+ springboot-redisson-lock
+ 0.0.1-SNAPSHOT
+ springboot-redisson-lock
+ Demo project for Spring Boot
+
+
+ 1.8
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
+
+ org.redisson
+ redisson-spring-boot-starter
+ 3.11.4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
diff --git a/springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/SpringbootRedissonLockApplication.java b/springboot-redisson-lock/src/main/java/com/xiaofu/redisson/SpringbootRedissonLockApplication.java
similarity index 89%
rename from springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/SpringbootRedissonLockApplication.java
rename to springboot-redisson-lock/src/main/java/com/xiaofu/redisson/SpringbootRedissonLockApplication.java
index d0b726e1..3928f33a 100644
--- a/springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/SpringbootRedissonLockApplication.java
+++ b/springboot-redisson-lock/src/main/java/com/xiaofu/redisson/SpringbootRedissonLockApplication.java
@@ -1,4 +1,4 @@
-package com.springboot101.redisson;
+package com.xiaofu.redisson;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/config/RedissonConfig.java b/springboot-redisson-lock/src/main/java/com/xiaofu/redisson/config/RedissonConfig.java
similarity index 80%
rename from springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/config/RedissonConfig.java
rename to springboot-redisson-lock/src/main/java/com/xiaofu/redisson/config/RedissonConfig.java
index efad9475..0e2675e4 100644
--- a/springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/config/RedissonConfig.java
+++ b/springboot-redisson-lock/src/main/java/com/xiaofu/redisson/config/RedissonConfig.java
@@ -1,4 +1,4 @@
-package com.springboot101.redisson.config;
+package com.xiaofu.redisson.config;
import org.redisson.Redisson;
import org.redisson.api.RedissonClient;
@@ -6,7 +6,7 @@
import org.springframework.context.annotation.Configuration;
/**
- * @Author: 公众号：程序员小富
+ * @Author: xinzhifu
* @Description:
*/
@Configuration
diff --git a/springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/controller/LiveObjectController.java b/springboot-redisson-lock/src/main/java/com/xiaofu/redisson/controller/LiveObjectController.java
similarity index 91%
rename from springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/controller/LiveObjectController.java
rename to springboot-redisson-lock/src/main/java/com/xiaofu/redisson/controller/LiveObjectController.java
index e87c03b6..569b3993 100644
--- a/springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/controller/LiveObjectController.java
+++ b/springboot-redisson-lock/src/main/java/com/xiaofu/redisson/controller/LiveObjectController.java
@@ -1,7 +1,6 @@
-package com.springboot101.redisson.controller;
+package com.xiaofu.redisson.controller;
-
-import com.springboot101.redisson.entity.OrderInfo;
+import com.xiaofu.redisson.entity.OrderInfo;
import org.redisson.api.RLiveObjectService;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +9,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
/**
- * @Author: 公众号：程序员小富
+ * @Author: xinzhifu
* @Description:
*/
@Controller
diff --git a/springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/controller/LockController.java b/springboot-redisson-lock/src/main/java/com/xiaofu/redisson/controller/LockController.java
similarity index 76%
rename from springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/controller/LockController.java
rename to springboot-redisson-lock/src/main/java/com/xiaofu/redisson/controller/LockController.java
index 5ed87564..2278f1ed 100644
--- a/springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/controller/LockController.java
+++ b/springboot-redisson-lock/src/main/java/com/xiaofu/redisson/controller/LockController.java
@@ -1,4 +1,4 @@
-package com.springboot101.redisson.controller;
+package com.xiaofu.redisson.controller;
import org.redisson.api.RFuture;
import org.redisson.api.RLock;
@@ -6,75 +6,83 @@
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.concurrent.TimeUnit;
/**
- * @Author: 公众号：程序员小富
+ * @Author: xinzhifu
* @Description:
*/
@Controller
-@RequestMapping("/lock")
+@RequestMapping
public class LockController {
@Autowired
private RedissonClient redissonClient;
+ @RequestMapping("/reduceStock")
+ @ResponseBody
+ public String reduceStock() {
+
+ RLock lock = redissonClient.getLock("order:A0001");
+ try {
+ lock.lock(5, TimeUnit.SECONDS);
+ Thread.currentThread().sleep(30000);
+ lock.unlock();
+ System.out.println("锁释放~");
+
+ } catch (Exception e) {
+ lock.unlock();
+ }
+ return null;
+ }
+
+
/**
- * @author xiaofu
+ * @author xinzhifu
* @description 可重入锁-普通
* @date 2020/7/16 15:20
*/
- @GetMapping("/reduceStock2")
- @ResponseBody
- public String reentrantLock(String order) {
+ public void reentrantLock() {
- RLock reentrantLock = redissonClient.getLock(order);
+ RLock reentrantLock = redissonClient.getLock("order:A0002");
try {
- if (reentrantLock.tryLock(100, 8, TimeUnit.SECONDS)) {
- System.out.println(Thread.currentThread().getName() + "---" + order + "---" + "加锁成功");
- Thread.currentThread().sleep(10000);
- return "YES";
- } else {
- System.out.println("线程 " + Thread.currentThread().getName() + "---" + order + "---" + "加锁失败");
- }
+ reentrantLock.lock();
+ //TODO something
+ reentrantLock.unlock();
+
} catch (Exception e) {
- //reentrantLock.unlock();
+ reentrantLock.unlock();
} finally {
- //reentrantLock.unlock();
+ reentrantLock.unlock();
}
- return "NO";
}
/**
- * @author xiaofu
+ * @author xinzhifu
* @description 可重入锁-设置过期时间
* @date 2020/7/16 15:20
*/
- public String reentrantLock2(String order) {
+ public void reentrantLock2() {
- RLock reentrantLock = redissonClient.getLock(order);
+ RLock reentrantLock = redissonClient.getLock("order:A0001");
try {
+
// 100尝试加锁的时间 ，10锁过期时间
if (reentrantLock.tryLock(100, 10, TimeUnit.SECONDS)) {
- //Thread.currentThread().sleep(10000);
- System.out.println(order + "加锁成功");
- } else {
- System.out.println(order + "已加锁");
+ //TODO something
}
} catch (Exception e) {
reentrantLock.unlock();
} finally {
reentrantLock.unlock();
}
- return "success";
}
/**
- * @author xiaofu
+ * @author xinzhifu
* @description 异步可重入锁-设置过期时间
* @date 2020/7/16 15:20
*/
@@ -96,7 +104,7 @@ public void reentrantLock2Async() {
}
/**
- * @author xiaofu
+ * @author xinzhifu
* @description 公平锁
* @date 2020/7/16 15:20
*/
@@ -120,7 +128,7 @@ public void fairLock() {
}
/**
- * @author xiaofu
+ * @author xinzhifu
* @description 联锁
* @date 2020/7/16 15:20
*/
@@ -143,7 +151,7 @@ public void multiLock() {
}
/**
- * @author xiaofu
+ * @author xinzhifu
* @description 红锁
* @date 2020/7/16 15:20
*/
@@ -166,7 +174,7 @@ public void redLock() {
}
/**
- * @author xiaofu
+ * @author xinzhifu
* @description 读写锁
* @date 2020/7/16 15:20
*/
diff --git a/springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/entity/OrderInfo.java b/springboot-redisson-lock/src/main/java/com/xiaofu/redisson/entity/OrderInfo.java
similarity index 89%
rename from springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/entity/OrderInfo.java
rename to springboot-redisson-lock/src/main/java/com/xiaofu/redisson/entity/OrderInfo.java
index 795214fc..58818aed 100644
--- a/springboot101/redis/springboot-redisson-lock/src/main/java/com/springboot101/redisson/entity/OrderInfo.java
+++ b/springboot-redisson-lock/src/main/java/com/xiaofu/redisson/entity/OrderInfo.java
@@ -1,11 +1,11 @@
-package com.springboot101.redisson.entity;
+package com.xiaofu.redisson.entity;
import org.redisson.api.annotation.REntity;
import org.redisson.api.annotation.RId;
import org.redisson.api.annotation.RIndex;
/**
- * @Author: 公众号：程序员小富
+ * @Author: xinzhifu
* @Description:
*/
@REntity
diff --git a/springboot-redisson-lock/src/main/resources/application.yml b/springboot-redisson-lock/src/main/resources/application.yml
new file mode 100644
index 00000000..8c318055
--- /dev/null
+++ b/springboot-redisson-lock/src/main/resources/application.yml
@@ -0,0 +1,4 @@
+spring:
+ redis:
+ redisson:
+ config: "classpath:redisson.yml"
\ No newline at end of file
diff --git a/springboot101/redis/springboot-redisson-lock/src/main/resources/redisson.yml b/springboot-redisson-lock/src/main/resources/redisson.yml
similarity index 88%
rename from springboot101/redis/springboot-redisson-lock/src/main/resources/redisson.yml
rename to springboot-redisson-lock/src/main/resources/redisson.yml
index 77d09ba2..1e6a8a18 100644
--- a/springboot101/redis/springboot-redisson-lock/src/main/resources/redisson.yml
+++ b/springboot-redisson-lock/src/main/resources/redisson.yml
@@ -6,10 +6,10 @@
"timeout":3000,
"retryAttempts":3,
"retryInterval":1500,
- "password":"redispw",
+ "password":"123456",
"subscriptionsPerConnection":5,
"clientName":null,
- "address": "redis://127.0.0.1:55001",
+ "address": "redis://127.0.0.1:6379",
"subscriptionConnectionMinimumIdleSize":1,
"subscriptionConnectionPoolSize":50,
"connectionMinimumIdleSize":32,
diff --git a/springboot-redisson-lock/src/test/java/com/xiaofu/redisson/SpringbootRedissonLockApplicationTests.java b/springboot-redisson-lock/src/test/java/com/xiaofu/redisson/SpringbootRedissonLockApplicationTests.java
new file mode 100644
index 00000000..b5c86033
--- /dev/null
+++ b/springboot-redisson-lock/src/test/java/com/xiaofu/redisson/SpringbootRedissonLockApplicationTests.java
@@ -0,0 +1,13 @@
+package com.xiaofu.redisson;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class SpringbootRedissonLockApplicationTests {
+
+ @Test
+ void contextLoads() {
+ }
+
+}
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/.gitignore" b/springboot-sharding-jdbc/.gitignore
similarity index 100%
rename from "springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/.gitignore"
rename to springboot-sharding-jdbc/.gitignore
diff --git a/springboot-sharding-jdbc/mvnw b/springboot-sharding-jdbc/mvnw
new file mode 100644
index 00000000..a16b5431
--- /dev/null
+++ b/springboot-sharding-jdbc/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ 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
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springboot-sharding-jdbc/mvnw.cmd b/springboot-sharding-jdbc/mvnw.cmd
new file mode 100644
index 00000000..c8d43372
--- /dev/null
+++ b/springboot-sharding-jdbc/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springboot-sharding-jdbc/pom.xml b/springboot-sharding-jdbc/pom.xml
new file mode 100644
index 00000000..23f2df5a
--- /dev/null
+++ b/springboot-sharding-jdbc/pom.xml
@@ -0,0 +1,97 @@
+
+
+ 4.0.0
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.0.3.RELEASE
+
+ com.xiaofu.sharding
+ springboot-sharding-jdbc
+ 0.0.1-SNAPSHOT
+ springboot-sharding-jdbc
+ Demo project for Spring Boot
+
+
+ 1.8
+ 4.0.0-RC1
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ com.baomidou
+ mybatis-plus-boot-starter
+ 3.1.0
+
+
+
+ mysql
+ mysql-connector-java
+
+
+
+ com.alibaba
+ druid-spring-boot-starter
+ 1.1.10
+
+
+
+ org.apache.shardingsphere
+ sharding-jdbc-spring-boot-starter
+ ${sharding-sphere.version}
+
+
+
+
+ org.apache.shardingsphere
+ sharding-core-common
+ ${sharding-sphere.version}
+
+
+ org.apache.commons
+ commons-lang3
+ 3.7
+
+
+
+ com.xiaoju.uemc.tinyid
+ tinyid-client
+ 0.1.0-SNAPSHOT
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ org.mybatis.generator
+ mybatis-generator-maven-plugin
+ 1.3.7
+
+ ${basedir}/src/main/resources/generator/generatorConfig.xml
+ true
+ true
+
+
+
+ mysql
+ mysql-connector-java
+ 8.0.20
+
+
+
+
+
+
+
diff --git a/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/MyPreciseShardingAlgorithm.java b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/MyPreciseShardingAlgorithm.java
new file mode 100644
index 00000000..6ee00dff
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/MyPreciseShardingAlgorithm.java
@@ -0,0 +1,27 @@
+package com.xiaofu.sharding;
+
+
+import org.apache.shardingsphere.api.sharding.standard.PreciseShardingAlgorithm;
+import org.apache.shardingsphere.api.sharding.standard.PreciseShardingValue;
+
+import java.util.Collection;
+
+/**
+ * 自定义分片算法
+ *
+ * @author yinjihuan
+ *
+ */
+public class MyPreciseShardingAlgorithm implements PreciseShardingAlgorithm {
+ @Override
+ public String doSharding(Collection availableTargetNames, PreciseShardingValue shardingValue) {
+ for (String tableName : availableTargetNames) {
+
+ String value = shardingValue.getValue() % 4 + "";
+ if (tableName.endsWith(value)) {
+ return tableName;
+ }
+ }
+ throw new IllegalArgumentException();
+ }
+}
diff --git a/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/SpringbootShardingJdbcApplication.java b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/SpringbootShardingJdbcApplication.java
new file mode 100644
index 00000000..604fd5ca
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/SpringbootShardingJdbcApplication.java
@@ -0,0 +1,15 @@
+package com.xiaofu.sharding;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@MapperScan(basePackages = "com.xiaofu.sharding.mapper")
+@SpringBootApplication
+public class SpringbootShardingJdbcApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(SpringbootShardingJdbcApplication.class, args);
+ }
+
+}
diff --git a/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/contoller/TestController.java b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/contoller/TestController.java
new file mode 100644
index 00000000..1020b5e9
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/contoller/TestController.java
@@ -0,0 +1,64 @@
+package com.xiaofu.sharding.contoller;
+
+import java.util.Date;
+
+import com.xiaofu.sharding.mapper.ConfigRepository;
+import com.xiaofu.sharding.model.TConfig;
+import com.xiaofu.sharding.model.TUser;
+import com.xiaofu.sharding.service.UserService;
+import com.xiaoju.uemc.tinyid.client.utils.TinyId;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @Author: xinzhifu
+ * @Description:
+ */
+@Controller
+@RequestMapping
+public class TestController {
+
+ @Autowired
+ private UserService userService;
+
+ @Autowired
+ private ConfigRepository configRepository;
+
+ @GetMapping(value = "/config")
+ @ResponseBody
+ public String config() {
+
+ TConfig tConfig = new TConfig();
+ tConfig.setRemark("我是备注13123123123123123");
+ tConfig.setCreateTime(new Date());
+ tConfig.setLastModifyTime(new Date());
+ configRepository.insert(tConfig);
+ tConfig.setId(1293488002854133762L);
+ configRepository.updateById(tConfig);
+ return "success";
+ }
+
+ @GetMapping(value = "/add")
+ @ResponseBody
+ public String insert() {
+ // 获取单个分布式自增ID
+ for (long i = 0; i < 10; i++) {
+ Long id = TinyId.nextId("user_primary_key");
+ TUser user = new TUser();
+ //user.setId(id);
+ user.setUsername("小富 " + i);
+ user.setPassword("123456");
+ user.setShardingId(i);
+ userService.addUser(user);
+ }
+ return "success";
+ }
+
+ @GetMapping("/users")
+ public Object list() {
+ return userService.getUsers();
+ }
+}
diff --git a/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/mapper/ConfigRepository.java b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/mapper/ConfigRepository.java
new file mode 100644
index 00000000..675d3972
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/mapper/ConfigRepository.java
@@ -0,0 +1,13 @@
+package com.xiaofu.sharding.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xiaofu.sharding.model.TConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface ConfigRepository extends BaseMapper {
+
+}
+
diff --git a/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/mapper/UserRepository.java b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/mapper/UserRepository.java
new file mode 100644
index 00000000..8a3fef02
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/mapper/UserRepository.java
@@ -0,0 +1,13 @@
+package com.xiaofu.sharding.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xiaofu.sharding.model.TUser;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface UserRepository extends BaseMapper {
+
+}
+
diff --git a/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/model/TConfig.java b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/model/TConfig.java
new file mode 100644
index 00000000..2de21a1d
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/model/TConfig.java
@@ -0,0 +1,47 @@
+package com.xiaofu.sharding.model;
+
+import java.util.Date;
+
+public class TConfig {
+
+ private Long id;
+
+ private String remark;
+
+ private Date createTime;
+
+ private Date lastModifyTime;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getLastModifyTime() {
+ return lastModifyTime;
+ }
+
+ public void setLastModifyTime(Date lastModifyTime) {
+ this.lastModifyTime = lastModifyTime;
+ }
+
+}
\ No newline at end of file
diff --git a/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/model/TUser.java b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/model/TUser.java
new file mode 100644
index 00000000..47b0fedf
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/model/TUser.java
@@ -0,0 +1,45 @@
+package com.xiaofu.sharding.model;
+
+public class TUser {
+
+ private Long id;
+
+ private String username;
+
+ private String password;
+
+ private Long shardingId;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username == null ? null : username.trim();
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password == null ? null : password.trim();
+ }
+
+ public Long getShardingId() {
+ return shardingId;
+ }
+
+ public void setShardingId(Long shardingId) {
+ this.shardingId = shardingId;
+ }
+
+}
\ No newline at end of file
diff --git a/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/service/UserService.java b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/service/UserService.java
new file mode 100644
index 00000000..7bb2a748
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/service/UserService.java
@@ -0,0 +1,20 @@
+package com.xiaofu.sharding.service;
+
+
+import com.xiaofu.sharding.model.TUser;
+
+import java.util.List;
+
+public interface UserService {
+
+ Integer addUser(TUser user);
+
+ List getUsers();
+
+ TUser getUser(Long id);
+
+ boolean deleteOne(Long id);
+
+ boolean updateUser(TUser user);
+
+}
diff --git a/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/service/impl/UserServiceImpl.java b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/service/impl/UserServiceImpl.java
new file mode 100644
index 00000000..f241f043
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/java/com/xiaofu/sharding/service/impl/UserServiceImpl.java
@@ -0,0 +1,43 @@
+package com.xiaofu.sharding.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.xiaofu.sharding.mapper.UserRepository;
+import com.xiaofu.sharding.model.TUser;
+import com.xiaofu.sharding.service.UserService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class UserServiceImpl implements UserService {
+
+ @Resource
+ UserRepository userRepository;
+
+ @Override
+ public Integer addUser(TUser user) {
+ return userRepository.insert(user);
+ }
+
+ @Override
+ public List getUsers() {
+ return userRepository.selectList(new QueryWrapper<>());
+ }
+
+ @Override
+ public TUser getUser(Long id) {
+ return null;
+ }
+
+ @Override
+ public boolean deleteOne(Long id) {
+ int i = userRepository.deleteById(id);
+ return i > 0;
+ }
+
+ @Override
+ public boolean updateUser(TUser user) {
+ return userRepository.updateById(user) > 0;
+ }
+}
diff --git a/springboot-sharding-jdbc/src/main/resources/application-sharding_jdbc.yml b/springboot-sharding-jdbc/src/main/resources/application-sharding_jdbc.yml
new file mode 100644
index 00000000..bf78c783
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/resources/application-sharding_jdbc.yml
@@ -0,0 +1,52 @@
+spring:
+ shardingsphere:
+ datasource:
+ names: ds-0,ds-1
+ ds-0:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.jdbc.Driver
+ url: jdbc:mysql://47.93.6.5:3306/ds-0?useUnicode=true&characterEncoding=utf8&tinyInt1isBit=false&useSSL=false&serverTimezone=GMT
+ username: root
+ password: xinzhifu521
+ ds-1:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driverClassName: com.mysql.jdbc.Driver
+ url: jdbc:mysql://47.93.6.5:3306/ds-1?useUnicode=true&characterEncoding=utf8&tinyInt1isBit=false&useSSL=false&serverTimezone=GMT
+ username: root
+ password: xinzhifu521
+ sharding:
+ tables:
+ t_user:
+ actual-data-nodes: ds-$->{0..1}.t_user_$->{0..4}
+ ## 指定分库规则
+ database-strategy:
+ inline:
+ sharding-column: id
+ #分片算法行表达式（只取最后两个数字进行分片）
+ algorithm-expression: ds-$->{id % 2}
+ ## 指定分表规则
+ table-strategy:
+ inline:
+ sharding-column: id
+ #分片算法行表达式（只取最后两个数字进行分片）
+ algorithm-expression: t_user_$->{id % 5}
+ ## 生成分布式主键
+ key-generator:
+ #自增列名称，缺省表示不使用自增主键生成器
+ column: id
+ #自增列值生成器类型，缺省表示使用默认自增列值生成器。可使用用户自定义的列值生成器或选择内置类型：SNOWFLAKE/UUID/LEAF_SEGMENT
+ type: SNOWFLAKE
+
+ # 绑定主表与子表，避免关联查询导致的全数据源路由
+ binding-tables: t_user
+ # 配置广播表：以广播的形式保存（如果只涉及查询的话可以不配置，会随机取一个数据源）
+ broadcast-tables: t_config
+ # 打印sql
+ props:
+ sql:
+ show: true
+
+#使用了mybatis-plus
+mybatis-plus:
+ mapper-locations: classpath:mapping/*.xml
+ map-underscore-to-camel-case: true
\ No newline at end of file
diff --git a/springboot-sharding-jdbc/src/main/resources/application.yml b/springboot-sharding-jdbc/src/main/resources/application.yml
new file mode 100644
index 00000000..ede1cf99
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/resources/application.yml
@@ -0,0 +1,5 @@
+spring:
+ profiles:
+ active: sharding_jdbc
+server:
+ port: 8001
\ No newline at end of file
diff --git a/springboot-sharding-jdbc/src/main/resources/generator/generatorConfig.xml b/springboot-sharding-jdbc/src/main/resources/generator/generatorConfig.xml
new file mode 100644
index 00000000..129bf2f0
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/resources/generator/generatorConfig.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/springboot-sharding-jdbc/src/main/resources/mapping/TConfigMapper.xml b/springboot-sharding-jdbc/src/main/resources/mapping/TConfigMapper.xml
new file mode 100644
index 00000000..42fd67e8
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/resources/mapping/TConfigMapper.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/springboot-sharding-jdbc/src/main/resources/mapping/TUserMapper.xml b/springboot-sharding-jdbc/src/main/resources/mapping/TUserMapper.xml
new file mode 100644
index 00000000..8b63ceca
--- /dev/null
+++ b/springboot-sharding-jdbc/src/main/resources/mapping/TUserMapper.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git "a/springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/.gitignore" b/springboot-testng-report/.gitignore
similarity index 100%
rename from "springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/.gitignore"
rename to springboot-testng-report/.gitignore
diff --git a/springboot-testng-report/mvnw b/springboot-testng-report/mvnw
new file mode 100644
index 00000000..a16b5431
--- /dev/null
+++ b/springboot-testng-report/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ 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
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springboot-testng-report/mvnw.cmd b/springboot-testng-report/mvnw.cmd
new file mode 100644
index 00000000..c8d43372
--- /dev/null
+++ b/springboot-testng-report/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git a/springboot-testng-report/pom.xml b/springboot-testng-report/pom.xml
new file mode 100644
index 00000000..878b75f0
--- /dev/null
+++ b/springboot-testng-report/pom.xml
@@ -0,0 +1,76 @@
+
+
+ 4.0.0
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.3.3.RELEASE
+
+ com.xiaofu.report
+ springboot-testng-report
+ 0.0.1-SNAPSHOT
+ springboot-testng-report
+ springboot-testng-report
+
+
+ 1.8
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
+
+ org.testng
+ testng
+ 7.1.0
+ test
+
+
+
+ com.aventstack
+ extentreports
+ 3.0.6
+
+
+
+ org.projectlombok
+ lombok
+ 1.16.18
+ provided
+
+
+
+ com.alibaba
+ fastjson
+ 1.2.49
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
diff --git a/springboot101/redis/springboot-aop-redis-lua/src/main/java/com/springboot101/limit/RedisLuaAopApplication.java b/springboot-testng-report/src/main/java/com/xiaofu/report/SpringbootTestngReportApplication.java
similarity index 56%
rename from springboot101/redis/springboot-aop-redis-lua/src/main/java/com/springboot101/limit/RedisLuaAopApplication.java
rename to springboot-testng-report/src/main/java/com/xiaofu/report/SpringbootTestngReportApplication.java
index d67325da..e88705da 100644
--- a/springboot101/redis/springboot-aop-redis-lua/src/main/java/com/springboot101/limit/RedisLuaAopApplication.java
+++ b/springboot-testng-report/src/main/java/com/xiaofu/report/SpringbootTestngReportApplication.java
@@ -1,13 +1,13 @@
-package com.springboot101.limit;
+package com.xiaofu.report;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
-public class RedisLuaAopApplication {
+public class SpringbootTestngReportApplication {
public static void main(String[] args) {
- SpringApplication.run(RedisLuaAopApplication.class, args);
+ SpringApplication.run(SpringbootTestngReportApplication.class, args);
}
}
diff --git a/shardingsphere101/shardingsphere-default-strategy/README.md b/springboot-testng-report/src/main/resources/application.properties
similarity index 100%
rename from shardingsphere101/shardingsphere-default-strategy/README.md
rename to springboot-testng-report/src/main/resources/application.properties
diff --git a/springboot-testng-report/src/test/java/com/xiaofu/report/OrderTest.java b/springboot-testng-report/src/test/java/com/xiaofu/report/OrderTest.java
new file mode 100644
index 00000000..66964683
--- /dev/null
+++ b/springboot-testng-report/src/test/java/com/xiaofu/report/OrderTest.java
@@ -0,0 +1,101 @@
+package com.xiaofu.report;
+
+import com.alibaba.fastjson.JSON;
+import com.xiaofu.report.config.ExtentTestNGIReporterListener;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.*;
+
+/**
+ * @author xiaofu
+ * @description testNG 单元测试
+ * @date 2020/3/19 16:43
+ */
+@Slf4j
+@Listeners({ExtentTestNGIReporterListener.class})
+@SpringBootTest(classes = SpringbootTestngReportApplication.class)
+public class OrderTest extends AbstractTestNGSpringContextTests {
+
+ @Data
+ class User {
+ private Integer userId;
+ private String userName;
+ }
+
+ /**
+ * 参数提供
+ */
+ @DataProvider(name = "paramDataProvider")
+ public Object[][] paramDataProvider() {
+ User user1 = new User();
+ user1.setUserId(1);
+ user1.setUserName("程序员内点事1");
+ User user2 = new User();
+ user2.setUserId(2);
+ user2.setUserName("程序员内点事2");
+ return new Object[][]{{1, user1}, {2, user2}};
+ }
+
+ @Test(dataProvider = "paramDataProvider",groups = "user")
+ public void queryUser(Integer index, User user) {
+ log.info("index：{}，user: {}", index, JSON.toJSONString(user));
+ }
+
+
+ @Test()
+ public void orderTest() {
+
+ log.info("我是小组");
+ }
+
+ @BeforeSuite
+ public void beforeSuite(){
+ log.info("beforeSuite");
+ }
+
+ @AfterSuite
+ public void afterSuite(){
+ log.info("AfterSuite");
+ }
+
+ @BeforeClass
+ public void beforeClass(){
+ log.info("BeforeClass");
+ }
+
+ @AfterClass
+ public void afterClass(){
+ log.info("AfterClass");
+ }
+
+ @BeforeTest
+ public void beforeTest(){
+ log.info("BeforeTest");
+ }
+
+ @AfterTest
+ public void afterTest(){
+ log.info("AfterTest");
+ }
+
+ @BeforeGroups
+ public void beforeGroups(){
+ log.info("BeforeGroups");
+ }
+ @AfterGroups
+ public void afterGroups(){
+ log.info("AfterGroups");
+ }
+
+ @BeforeMethod
+ public void BeforeMethod(){
+ log.info("BeforeMethod");
+ }
+
+ @AfterMethod
+ public void AfterMethod(){
+ log.info("AfterMethod");
+ }
+}
diff --git a/springboot-testng-report/src/test/java/com/xiaofu/report/UserTest.java b/springboot-testng-report/src/test/java/com/xiaofu/report/UserTest.java
new file mode 100644
index 00000000..41bfa721
--- /dev/null
+++ b/springboot-testng-report/src/test/java/com/xiaofu/report/UserTest.java
@@ -0,0 +1,84 @@
+package com.xiaofu.report;
+
+import com.xiaofu.report.config.ExtentTestNGIReporterListener;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.testng.annotations.*;
+
+/**
+ * @author xiaofu
+ * @description testNG 单元测试
+ * @date 2020/3/19 16:43
+ */
+@Slf4j
+@Listeners({ExtentTestNGIReporterListener.class})
+@SpringBootTest(classes = SpringbootTestngReportApplication.class)
+public class UserTest extends AbstractTestNGSpringContextTests {
+
+ @Test(groups = "user")
+ public void queryUser(String name) {
+
+ log.info("我是测试方法~");
+ }
+
+ @BeforeSuite
+ public void beforeSuite(){
+ log.info("beforeSuite");
+ }
+
+ @AfterSuite
+ public void afterSuite(){
+ log.info("AfterSuite");
+ }
+
+ @BeforeClass
+ public void beforeClass(){
+ log.info("BeforeClass");
+ }
+
+ @AfterClass
+ public void afterClass(){
+ log.info("AfterClass");
+ }
+
+ @BeforeTest
+ public void beforeTest(){
+ log.info("BeforeTest");
+ }
+
+ @AfterTest
+ public void afterTest(){
+ log.info("AfterTest");
+ }
+
+ @BeforeGroups(groups="user")
+ public void beforeGroups(){
+ log.info("BeforeGroups");
+ }
+ @AfterGroups(groups="user")
+ public void afterGroups(){
+ log.info("AfterGroups");
+ }
+
+ @BeforeMethod
+ public void BeforeMethod(){
+ log.info("BeforeMethod");
+ }
+
+ @AfterMethod
+ public void AfterMethod(){
+ log.info("AfterMethod");
+ }
+
+
+ @Test
+ public void token() {
+ System.out.println("get token");
+ }
+
+ @Test(dependsOnMethods= {"token"})
+ public void getUser() {
+ System.out.println("this is test getUser");
+ }
+}
diff --git a/springboot-testng-report/src/test/java/com/xiaofu/report/config/BaseTest.java b/springboot-testng-report/src/test/java/com/xiaofu/report/config/BaseTest.java
new file mode 100644
index 00000000..bea69d7b
--- /dev/null
+++ b/springboot-testng-report/src/test/java/com/xiaofu/report/config/BaseTest.java
@@ -0,0 +1,22 @@
+package com.xiaofu.report.config;
+
+import com.xiaofu.report.SpringbootTestngReportApplication;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.testng.annotations.Listeners;
+
+/**
+ * @Author: xiaofu
+ * @Description:
+ */
+@SpringBootTest(classes = SpringbootTestngReportApplication.class)
+@WebAppConfiguration
+@Slf4j
+@Listeners({ExtentTestNGIReporterListener.class})
+public class BaseTest extends AbstractTestNGSpringContextTests {
+
+ public BaseTest() {
+ }
+}
diff --git a/springboot-testng-report/src/test/java/com/xiaofu/report/config/ExtentTestNGIReporterListener.java b/springboot-testng-report/src/test/java/com/xiaofu/report/config/ExtentTestNGIReporterListener.java
new file mode 100644
index 00000000..1bd08191
--- /dev/null
+++ b/springboot-testng-report/src/test/java/com/xiaofu/report/config/ExtentTestNGIReporterListener.java
@@ -0,0 +1,197 @@
+package com.xiaofu.report.config;
+
+import com.aventstack.extentreports.ExtentReports;
+import com.aventstack.extentreports.ExtentTest;
+import com.aventstack.extentreports.ResourceCDN;
+import com.aventstack.extentreports.Status;
+import com.aventstack.extentreports.model.TestAttribute;
+import com.aventstack.extentreports.reporter.ExtentHtmlReporter;
+import com.aventstack.extentreports.reporter.configuration.ChartLocation;
+import com.aventstack.extentreports.reporter.configuration.Theme;
+import org.testng.*;
+import org.testng.xml.XmlSuite;
+
+import java.io.File;
+import java.util.*;
+
+/**
+ * @author xiaofu
+ * @description TestNg 可视化配置
+ * @date 2020/3/19 16:44
+ */
+public class ExtentTestNGIReporterListener implements IReporter {
+ //生成的路径以及文件名
+ private static final String OUTPUT_FOLDER = "target/test-report/";
+ private static final String FILE_NAME = "index.html";
+
+ private ExtentReports extent;
+
+ @Override
+ public void generateReport(List xmlSuites, List suites, String outputDirectory) {
+ init();
+ boolean createSuiteNode = false;
+ if (suites.size() > 1) {
+ createSuiteNode = true;
+ }
+ for (ISuite suite : suites) {
+ Map result = suite.getResults();
+ //如果suite里面没有任何用例，直接跳过，不在报告里生成
+ if (result.size() == 0) {
+ continue;
+ }
+ //统计suite下的成功、失败、跳过的总用例数
+ int suiteFailSize = 0;
+ int suitePassSize = 0;
+ int suiteSkipSize = 0;
+ ExtentTest suiteTest = null;
+ //存在多个suite的情况下，在报告中将同一个一个suite的测试结果归为一类，创建一级节点。
+ if (createSuiteNode) {
+ suiteTest = extent.createTest(suite.getName()).assignCategory(suite.getName());
+ }
+ boolean createSuiteResultNode = false;
+ if (result.size() > 1) {
+ createSuiteResultNode = true;
+ }
+ for (ISuiteResult r : result.values()) {
+ ExtentTest resultNode;
+ ITestContext context = r.getTestContext();
+ if (createSuiteResultNode) {
+ //没有创建suite的情况下，将在SuiteResult的创建为一级节点，否则创建为suite的一个子节点。
+ if (null == suiteTest) {
+ resultNode = extent.createTest(r.getTestContext().getName());
+ } else {
+ resultNode = suiteTest.createNode(r.getTestContext().getName());
+ }
+ } else {
+ resultNode = suiteTest;
+ }
+ if (resultNode != null) {
+ resultNode.getModel().setName(suite.getName() + " : " + r.getTestContext().getName());
+ if (resultNode.getModel().hasCategory()) {
+ resultNode.assignCategory(r.getTestContext().getName());
+ } else {
+ resultNode.assignCategory(suite.getName(), r.getTestContext().getName());
+ }
+ resultNode.getModel().setStartTime(r.getTestContext().getStartDate());
+ resultNode.getModel().setEndTime(r.getTestContext().getEndDate());
+ //统计SuiteResult下的数据
+ int passSize = r.getTestContext().getPassedTests().size();
+ int failSize = r.getTestContext().getFailedTests().size();
+ int skipSize = r.getTestContext().getSkippedTests().size();
+ suitePassSize += passSize;
+ suiteFailSize += failSize;
+ suiteSkipSize += skipSize;
+ if (failSize > 0) {
+ resultNode.getModel().setStatus(Status.FAIL);
+ }
+ resultNode.getModel().setDescription(String.format("Pass: %s ; Fail: %s ; Skip: %s ;", passSize, failSize, skipSize));
+ }
+ buildTestNodes(resultNode, context.getFailedTests(), Status.FAIL);
+ buildTestNodes(resultNode, context.getSkippedTests(), Status.SKIP);
+ buildTestNodes(resultNode, context.getPassedTests(), Status.PASS);
+ }
+ if (suiteTest != null) {
+ suiteTest.getModel().setDescription(String.format("Pass: %s ; Fail: %s ; Skip: %s ;", suitePassSize, suiteFailSize, suiteSkipSize));
+ if (suiteFailSize > 0) {
+ suiteTest.getModel().setStatus(Status.FAIL);
+ }
+ }
+
+ }
+ for (String s : Reporter.getOutput()) {
+ extent.setTestRunnerOutput(s);
+ }
+ extent.flush();
+ }
+
+ private void init() {
+ //文件夹不存在的话进行创建
+ File reportDir = new File(OUTPUT_FOLDER);
+ if (!reportDir.exists() && !reportDir.isDirectory()) {
+ reportDir.mkdirs();
+ }
+ ExtentHtmlReporter htmlReporter = new ExtentHtmlReporter(OUTPUT_FOLDER + FILE_NAME);
+ // 设置静态文件的DNS
+ //怎么样解决cdn.rawgit.com访问不了的情况
+ htmlReporter.config().setResourceCDN(ResourceCDN.EXTENTREPORTS);
+
+ htmlReporter.config().setDocumentTitle("用户服务自动化测试报告");
+ htmlReporter.config().setReportName("用户服务自动化测试报告");
+ htmlReporter.config().setChartVisibilityOnOpen(true);
+ htmlReporter.config().setTestViewChartLocation(ChartLocation.TOP);
+ htmlReporter.config().setTheme(Theme.STANDARD);
+ htmlReporter.config().setEncoding("utf-8");
+ htmlReporter.config().setCSS(".node.level-1 ul{ display:none;} .node.level-1.active ul{display:block;}");
+
+ extent = new ExtentReports();
+ extent.attachReporter(htmlReporter);
+ extent.setReportUsesManualConfiguration(true);
+
+ }
+
+ private void buildTestNodes(ExtentTest extenttest, IResultMap tests, Status status) {
+ //存在父节点时，获取父节点的标签
+ String[] categories = new String[0];
+ if (extenttest != null) {
+ List categoryList = extenttest.getModel().getCategoryContext().getAll();
+ categories = new String[categoryList.size()];
+ for (int index = 0; index < categoryList.size(); index++) {
+ categories[index] = categoryList.get(index).getName();
+ }
+ }
+
+ ExtentTest test;
+
+ if (tests.size() > 0) {
+ //调整用例排序，按时间排序
+ Set treeSet = new TreeSet(new Comparator() {
+ @Override
+ public int compare(ITestResult o1, ITestResult o2) {
+ return o1.getStartMillis() < o2.getStartMillis() ? -1 : 1;
+ }
+ });
+ treeSet.addAll(tests.getAllResults());
+ for (ITestResult result : treeSet) {
+ Object[] parameters = result.getParameters();
+ String name = "";
+ //如果有参数，则使用参数的toString组合代替报告中的name
+ for (Object param : parameters) {
+ name += param.toString();
+ }
+ if (name.length() == 0) {
+ name = result.getMethod().getMethodName();
+ }
+ if (extenttest == null) {
+ test = extent.createTest(name);
+ } else {
+ //作为子节点进行创建时，设置同父节点的标签一致，便于报告检索。
+ test = extenttest.createNode(name).assignCategory(categories);
+ }
+ //test.getModel().setDescription(description.toString());
+ //test = extent.createTest(result.getMethod().getMethodName());
+ for (String group : result.getMethod().getGroups())
+ test.assignCategory(group);
+
+ List outputList = Reporter.getOutput(result);
+ for (String output : outputList) {
+ //将用例的log输出报告中
+ test.debug(output);
+ }
+ if (result.getThrowable() != null) {
+ test.log(status, result.getThrowable());
+ } else {
+ test.log(status, "Test " + status.toString().toLowerCase() + "ed");
+ }
+
+ test.getModel().setStartTime(getTime(result.getStartMillis()));
+ test.getModel().setEndTime(getTime(result.getEndMillis()));
+ }
+ }
+ }
+
+ private Date getTime(long millis) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(millis);
+ return calendar.getTime();
+ }
+}
\ No newline at end of file
diff --git a/springboot-testng-report/src/test/java/com/xiaofu/report/xml/UserTest.xml b/springboot-testng-report/src/test/java/com/xiaofu/report/xml/UserTest.xml
new file mode 100644
index 00000000..5d6936ff
--- /dev/null
+++ b/springboot-testng-report/src/test/java/com/xiaofu/report/xml/UserTest.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/.gitignore" b/springboot-work-flowable/.gitignore
similarity index 100%
rename from "springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/.gitignore"
rename to springboot-work-flowable/.gitignore
diff --git a/springboot-work-flowable/mvnw b/springboot-work-flowable/mvnw
new file mode 100644
index 00000000..a16b5431
--- /dev/null
+++ b/springboot-work-flowable/mvnw
@@ -0,0 +1,310 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
+
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+ # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ export JAVA_HOME="`/usr/libexec/java_home`"
+ else
+ export JAVA_HOME="/Library/Java/Home"
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ 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
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname "$PRG"`/..
+
+ # make it fully qualified
+ M2_HOME=`cd "$M2_HOME" && pwd`
+
+ cd "$saveddir"
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --unix "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME="`(cd "$M2_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ javaExecutable="`which javac`"
+ if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+ # readlink(1) is not available as standard on Solaris 10.
+ readLink=`which readlink`
+ if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+ if $darwin ; then
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+ else
+ javaExecutable="`readlink -f \"$javaExecutable\"`"
+ fi
+ javaHome="`dirname \"$javaExecutable\"`"
+ javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+ JAVA_HOME="$javaHome"
+ export JAVA_HOME
+ fi
+ fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD="`which java`"
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly." >&2
+ echo " We cannot execute $JAVACMD" >&2
+ exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+ echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+ if [ -z "$1" ]
+ then
+ echo "Path not specified to find_maven_basedir"
+ return 1
+ fi
+
+ basedir="$1"
+ wdir="$1"
+ while [ "$wdir" != '/' ] ; do
+ if [ -d "$wdir"/.mvn ] ; then
+ basedir=$wdir
+ break
+ fi
+ # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+ if [ -d "${wdir}" ]; then
+ wdir=`cd "$wdir/.."; pwd`
+ fi
+ # end of workaround
+ done
+ echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+ if [ -f "$1" ]; then
+ echo "$(tr -s '\n' ' ' < "$1")"
+ fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+ exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found .mvn/wrapper/maven-wrapper.jar"
+ fi
+else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+ fi
+ if [ -n "$MVNW_REPOURL" ]; then
+ jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ else
+ jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ fi
+ while IFS="=" read key value; do
+ case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+ esac
+ done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Downloading from: $jarUrl"
+ fi
+ wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+ if $cygwin; then
+ wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+ fi
+
+ if command -v wget > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found wget ... using wget"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ wget "$jarUrl" -O "$wrapperJarPath"
+ else
+ wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+ fi
+ elif command -v curl > /dev/null; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Found curl ... using curl"
+ fi
+ if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+ curl -o "$wrapperJarPath" "$jarUrl" -f
+ else
+ curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+ fi
+
+ else
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo "Falling back to using Java to download"
+ fi
+ javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+ # For Cygwin, switch paths to Windows format before running javac
+ if $cygwin; then
+ javaClass=`cygpath --path --windows "$javaClass"`
+ fi
+ if [ -e "$javaClass" ]; then
+ if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Compiling MavenWrapperDownloader.java ..."
+ fi
+ # Compiling the Java class
+ ("$JAVA_HOME/bin/javac" "$javaClass")
+ fi
+ if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+ # Running the downloader
+ if [ "$MVNW_VERBOSE" = true ]; then
+ echo " - Running MavenWrapperDownloader.java ..."
+ fi
+ ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+ fi
+ fi
+ fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+ echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$M2_HOME" ] &&
+ M2_HOME=`cygpath --path --windows "$M2_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] &&
+ CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+ MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+ $MAVEN_OPTS \
+ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+ ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/springboot-work-flowable/mvnw.cmd b/springboot-work-flowable/mvnw.cmd
new file mode 100644
index 00000000..c8d43372
--- /dev/null
+++ b/springboot-work-flowable/mvnw.cmd
@@ -0,0 +1,182 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM https://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+ IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Found %WRAPPER_JAR%
+ )
+) else (
+ if not "%MVNW_REPOURL%" == "" (
+ SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+ )
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Couldn't find %WRAPPER_JAR%, downloading it ...
+ echo Downloading from: %DOWNLOAD_URL%
+ )
+
+ powershell -Command "&{"^
+ "$webclient = new-object System.Net.WebClient;"^
+ "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+ "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+ "}"^
+ "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+ "}"
+ if "%MVNW_VERBOSE%" == "true" (
+ echo Finished downloading %WRAPPER_JAR%
+ )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%
diff --git "a/springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/pom.xml" b/springboot-work-flowable/pom.xml
similarity index 55%
rename from "springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/pom.xml"
rename to springboot-work-flowable/pom.xml
index 2d18f5fd..e7356529 100644
--- "a/springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/pom.xml"
+++ b/springboot-work-flowable/pom.xml
@@ -3,32 +3,62 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.3.3.RELEASE
+
+ com.xiaofu.flowable
springboot-work-flowable
0.0.1-SNAPSHOT
springboot-work-flowable
+ Demo project for Spring Boot
+
+
+ 1.8
+
+
org.flowable
flowable-spring-boot-starter
6.3.0
-
org.springframework.boot
spring-boot-starter-jdbc
-
+
+ org.springframework.boot
+ spring-boot-starter-web
+
org.mybatis.spring.boot
mybatis-spring-boot-starter
1.3.2
+
+
+ mysql
+ mysql-connector-java
+ runtime
+
+
+
+ org.projectlombok
+ lombok
+ 1.16.18
+ provided
+
+
+
+ com.alibaba
+ fastjson
+ 1.2.49
+
+
diff --git "a/springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/java/com/springboot101/flowable/SpringbootWorkFlowableApplication.java" b/springboot-work-flowable/src/main/java/com/xiaofu/flowable/SpringbootWorkFlowableApplication.java
similarity index 89%
rename from "springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/java/com/springboot101/flowable/SpringbootWorkFlowableApplication.java"
rename to springboot-work-flowable/src/main/java/com/xiaofu/flowable/SpringbootWorkFlowableApplication.java
index 2ed87ad6..335dede8 100644
--- "a/springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/java/com/springboot101/flowable/SpringbootWorkFlowableApplication.java"
+++ b/springboot-work-flowable/src/main/java/com/xiaofu/flowable/SpringbootWorkFlowableApplication.java
@@ -1,4 +1,4 @@
-package com.springboot101.flowable;
+package com.xiaofu.flowable;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git "a/springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/java/com/springboot101/flowable/config/FlowableConfig.java" b/springboot-work-flowable/src/main/java/com/xiaofu/flowable/config/FlowableConfig.java
similarity index 90%
rename from "springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/java/com/springboot101/flowable/config/FlowableConfig.java"
rename to springboot-work-flowable/src/main/java/com/xiaofu/flowable/config/FlowableConfig.java
index a3b23ee6..8a39d415 100644
--- "a/springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/java/com/springboot101/flowable/config/FlowableConfig.java"
+++ b/springboot-work-flowable/src/main/java/com/xiaofu/flowable/config/FlowableConfig.java
@@ -1,11 +1,11 @@
-package com.springboot101.flowable.config;
+package com.xiaofu.flowable.config;
import org.flowable.spring.SpringProcessEngineConfiguration;
import org.flowable.spring.boot.EngineConfigurationConfigurer;
import org.springframework.context.annotation.Configuration;
/**
- * @author 程序员小富
+ * @author xinzhifu
* @description 设置样式，解决中文乱码
* @date 2020/8/27 15:04
*/
diff --git "a/springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/java/com/springboot101/flowable/controller/LeaveController.java" b/springboot-work-flowable/src/main/java/com/xiaofu/flowable/controller/LeaveController.java
similarity index 96%
rename from "springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/java/com/springboot101/flowable/controller/LeaveController.java"
rename to springboot-work-flowable/src/main/java/com/xiaofu/flowable/controller/LeaveController.java
index 3fa36e69..63eacc48 100644
--- "a/springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/java/com/springboot101/flowable/controller/LeaveController.java"
+++ b/springboot-work-flowable/src/main/java/com/xiaofu/flowable/controller/LeaveController.java
@@ -1,4 +1,4 @@
-package com.springboot101.flowable.controller;
+package com.xiaofu.flowable.controller;
import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.BpmnModel;
@@ -34,7 +34,7 @@ public class LeaveController {
private ProcessEngine processEngine;
/**
- * @author 公众号：程序员小富
+ * @author xiaofu
* @description 启动流程
* @date 2020/8/26 17:36
*/
@@ -55,7 +55,7 @@ public String startLeaveProcess(String staffId) {
/**
* @param taskId
- * @author 程序员小富
+ * @author xinzhifu
* @description 批准
* @date 2020/8/27 14:30
*/
@@ -74,7 +74,7 @@ public String applyTask(String taskId) {
/**
* @param taskId
- * @author 程序员小富
+ * @author xinzhifu
* @description 驳回
* @date 2020/8/27 14:30
*/
@@ -89,7 +89,7 @@ public String rejectTask(String taskId) {
/**
- * @author 公众号：程序员小富
+ * @author xiaofu
* @description 生成流程图
* @date 2020/8/27 14:29
*/
diff --git "a/springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/resources/application.yml" b/springboot-work-flowable/src/main/resources/application.yml
similarity index 100%
rename from "springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/resources/application.yml"
rename to springboot-work-flowable/src/main/resources/application.yml
diff --git "a/springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/resources/processes/LeaveProcess.bpmn20.xml" b/springboot-work-flowable/src/main/resources/processes/LeaveProcess.bpmn20.xml
similarity index 100%
rename from "springboot101/\345\267\245\344\275\234\346\265\201/springboot-work-flowable/src/main/resources/processes/LeaveProcess.bpmn20.xml"
rename to springboot-work-flowable/src/main/resources/processes/LeaveProcess.bpmn20.xml
diff --git a/springboot101/.gitignore b/springboot101/.gitignore
deleted file mode 100644
index 86306e62..00000000
--- a/springboot101/.gitignore
+++ /dev/null
@@ -1,36 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-!/基础配置/springboot-database-doc/mvnw
-!/基础配置/springboot-database-doc/mvnw
-!/低代码/springboot-magic-api/target/
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/pom.xml b/springboot101/MQTT/springboot-mqtt-messagepush/pom.xml
deleted file mode 100644
index c5642936..00000000
--- a/springboot101/MQTT/springboot-mqtt-messagepush/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
- springboot-mqtt-messagepush
- 0.0.1-SNAPSHOT
- springboot-mqtt-messagepush
-
-
-
-
-
- org.springframework.integration
- spring-integration-mqtt
-
-
-
- org.eclipse.paho
- org.eclipse.paho.client.mqttv3
- [1.2.1,)
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
-
diff --git a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/static/js/follow.js b/springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/static/js/follow.js
deleted file mode 100644
index 333bac7b..00000000
--- a/springboot101/MQTT/springboot-mqtt-messagepush/src/main/resources/static/js/follow.js
+++ /dev/null
@@ -1,7 +0,0 @@
-document.writeln("
")*/
-
-
-document.writeln('
');*/
\ No newline at end of file
diff --git a/springboot101/README.md b/springboot101/README.md
deleted file mode 100644
index 566526c2..00000000
--- a/springboot101/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-## SpringBoot101
-
-SpringBoot101 是一个SpringBoot从入门到精通的系列教程，
-
-## 基础
-- Springboot hello（脚手架）
-
-## 基础
-- springboot多环境打包配置
-
-## 模版引擎
-- springboot整合Thymeleaf模板
-- springboot整合Jsp模板
-- springboot整合FreeMarker模板
-- springboot整合Velocity模板
-
-## 通用
-
-- Springboot自定义启动banner
-- Springboot 如何构建一个 RESTful 风格的 Web 服务
-- Springboot 统一返回值
-- Springboot 全局异常捕获
-- Springboot 6种读取配置文件的方案
-- Springboot 3种全局时间格式化方案
-- Springboot 实现flowable工作流
-- Springboot 自定义注解实现Log日志打印
-- Springboot 防盗链的实现
-- Springboot 自定义拦截器
-- Springboot 自定义过滤器
-- Springboot 自定义注解实现AOP切面
-- Springboot 十五个拓展点
-
-
diff --git a/springboot101/pom.xml b/springboot101/pom.xml
deleted file mode 100644
index d6a63145..00000000
--- a/springboot101/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-
-
- 4.0.0
-
- com.notebook
- Springboot-Notebook
- 0.0.1-SNAPSHOT
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
- springboot101
- pom
-
-
-
- MQTT/springboot-mqtt-messagepush
- rabbitmq/springboot-rabbitmq-confirm
-
-
- redis/springboot-aop-redis-lua
- redis/springboot-redisson-lock
-
-
- 低代码/springboot-erupt
- 低代码/springboot-magic-api
-
-
- webhook/springboot-webhook-wechat
- 人脸识别/springboot-detect-faces
- 去水印/springboot-douyin-watermark
- 实时推送/springboot-realtime-data
- 工作流/springboot-work-flowable
-
-
- 文件操作/springboot-file-storage
-
-
- 通用功能/springboot-aop-unifiedlog
- 通用功能/springboot-database-doc
- 通用功能/springboot-delayqueue
- 通用功能/springboot-env-variables
- 通用功能/springboot-global-formatting
- 通用功能/springboot-jasypt
- 通用功能/springboot-banner
- 通用功能/springboot-valid-params
- 通用功能/springboot-streaming
-
-
- 接口文档/springboot-swagger
- 接口文档/springboot-knife4j
-
-
- 设计模式/springboot-design-chain
-
-
- 模版引擎/springboot-thymeleaf
-
-
- 数据库/springboot-dynamic-datasource
-
-
-
- UTF-8
- UTF-8
- 2.7.6
-
-
-
-
-
- org.springframework.boot
- spring-boot-dependencies
- ${spring-boot.version}
- pom
- import
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.8.1
-
-
-
-
diff --git a/springboot101/rabbitmq/springboot-rabbitmq-confirm/pom.xml b/springboot101/rabbitmq/springboot-rabbitmq-confirm/pom.xml
deleted file mode 100644
index 0172808c..00000000
--- a/springboot101/rabbitmq/springboot-rabbitmq-confirm/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
- springboot-rabbitmq-confirm
- 0.0.1-SNAPSHOT
- springboot-rabbitmq-confirm
-
-
-
- org.springframework.boot
- spring-boot-starter-amqp
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
-
diff --git a/springboot101/redis/springboot-aop-redis-lua/README.md b/springboot101/redis/springboot-aop-redis-lua/README.md
deleted file mode 100644
index d706b778..00000000
--- a/springboot101/redis/springboot-aop-redis-lua/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# springboot-aop-redis-lua
-springboot-aop-redis-lua 实现的分布式限流方案
-
-# 关注公众号【程序员小富】，获取 2000G 面试题、电子书、架构技术学习资料
diff --git a/springboot101/redis/springboot-aop-redis-lua/pom.xml b/springboot101/redis/springboot-aop-redis-lua/pom.xml
deleted file mode 100644
index 5718fb79..00000000
--- a/springboot101/redis/springboot-aop-redis-lua/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
- springboot-aop-redis-lua
- 0.0.1-SNAPSHOT
- springboot-aop-redis-lua
-
-
-
-
- org.springframework.boot
- spring-boot-starter-data-redis
-
-
- org.springframework.boot
- spring-boot-starter-aop
-
-
-
- com.google.guava
- guava
- 32.0.0-jre
-
-
-
- org.apache.commons
- commons-lang3
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
-
diff --git a/springboot101/redis/springboot-aop-redis-lua/src/main/java/com/springboot101/limit/controller/RedisController.java b/springboot101/redis/springboot-aop-redis-lua/src/main/java/com/springboot101/limit/controller/RedisController.java
deleted file mode 100644
index 713000bf..00000000
--- a/springboot101/redis/springboot-aop-redis-lua/src/main/java/com/springboot101/limit/controller/RedisController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.springboot101.limit.controller;
-
-import com.alibaba.fastjson.JSON;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * @Author: 公众号：程序员小富
- * @Description:
- */
-@Controller
-public class RedisController {
-
- @Autowired
- private RedisTemplate redisTemplate;
-
- @GetMapping("/addKey")
- @ResponseBody
- public String addkey() {
-
- for (int i = 0; i < 500000; i++) {
-
- redisTemplate.opsForValue().set("test_key_" + i, i);
- }
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/springboot101/redis/springboot-redisson-lock/pom.xml b/springboot101/redis/springboot-redisson-lock/pom.xml
deleted file mode 100644
index b3ff5193..00000000
--- a/springboot101/redis/springboot-redisson-lock/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
- springboot-redisson-lock
- 0.0.1-SNAPSHOT
- springboot-redisson-lock
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-thymeleaf
-
-
-
- org.redisson
- redisson-spring-boot-starter
- 3.11.4
-
-
-
- org.springframework.boot
- spring-boot-starter-data-redis
- 2.3.1.RELEASE
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
-
diff --git a/springboot101/redis/springboot-redisson-lock/src/main/resources/application.yml b/springboot101/redis/springboot-redisson-lock/src/main/resources/application.yml
deleted file mode 100644
index 13f962e2..00000000
--- a/springboot101/redis/springboot-redisson-lock/src/main/resources/application.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-spring:
- redis:
- redisson:
- config: "classpath:redisson.yml"
-server:
- port: 8083
-
diff --git a/springboot101/webhook/springboot-webhook-wechat/.gitignore b/springboot101/webhook/springboot-webhook-wechat/.gitignore
deleted file mode 100644
index a2a3040a..00000000
--- a/springboot101/webhook/springboot-webhook-wechat/.gitignore
+++ /dev/null
@@ -1,31 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**
-!**/src/test/**
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-
-### VS Code ###
-.vscode/
diff --git a/springboot101/webhook/springboot-webhook-wechat/README.md b/springboot101/webhook/springboot-webhook-wechat/README.md
deleted file mode 100644
index f545a45f..00000000
--- a/springboot101/webhook/springboot-webhook-wechat/README.md
+++ /dev/null
@@ -1 +0,0 @@
-本文文章地址：
\ No newline at end of file
diff --git a/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/WebhookApplication.java b/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/WebhookApplication.java
deleted file mode 100644
index c84cb766..00000000
--- a/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/WebhookApplication.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-
-@ComponentScan("com.sprinboot101.webhook")
-@SpringBootApplication
-public class WebhookApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(WebhookApplication.class, args);
- }
-
-}
diff --git a/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/controller/WebhookController.java b/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/controller/WebhookController.java
deleted file mode 100644
index eccda3b2..00000000
--- a/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/controller/WebhookController.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.springboot101.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.springboot101.utils.HttpUtil;
-import com.springboot101.vo.GithubWebhookPullVo;
-import com.springboot101.vo.WeChatWebhook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-@RestController
-public class WebhookController {
- private static final Logger log = LoggerFactory.getLogger(HttpUtil.class);
- private static final String WECHAT_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=145a516a-dd15-421f-97a3-ba3bf1479369";
-
- private static final String GITHUB_API = "https://api.github.com/users/";
-
- /**
- * @param webhook webhook
- * @Author 程序员内点事
- * @Description: github 回调
- * @Date 2021/05/19
- */
- @PostMapping("/webhook")
- public String webhookGithub(@RequestBody GithubWebhookPullVo webhook) {
- log.info("webhook 入参接收 weChatWebhook {}", JSON.toJSONString(webhook));
-
- // 获取仓库名和当前时间
- String name = webhook.getRepository().getName();
- SimpleDateFormat simpleFormatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String now = simpleFormatter.format(new Date());
-
- StringBuilder contentBuilder = new StringBuilder();
- if (!webhook.getCommits().isEmpty()) {
- GithubWebhookPullVo.CommitsDTO commitsDTO = webhook.getCommits().get(0);
- contentBuilder.append("提交者：[ ").append(commitsDTO.getCommitter().getName()).append(" ] \r\n")
- .append("时间：[ ").append(now).append(" ]\n")
- .append("向远程仓库 [ ").append(name).append(" ]推送代码 \n")
- .append("提交详情： \n");
-
- appendListContent(contentBuilder, "添加文件: \n[\n", commitsDTO.getAdded());
- appendListContent(contentBuilder, "修改文件: \n[\n", commitsDTO.getModified());
- appendListContent(contentBuilder, "删除文件: \n[\n", commitsDTO.getRemoved());
- }
-
- String content = contentBuilder.toString();
- log.info(content);
-
- WeChatWebhook weChatWebhook = new WeChatWebhook();
- weChatWebhook.setMsgtype("text");
- WeChatWebhook.TextDTO textDTO = new WeChatWebhook.TextDTO();
- textDTO.setContent(content);
- textDTO.setMentionedList(Arrays.asList("@all"));
- textDTO.setMentionedMobileList(Arrays.asList("@all"));
- weChatWebhook.setText(textDTO);
-
- /**
- * 组装参数后向企业微信发送webhook请求
- */
- log.info("企业微信发送参数 {}", JSON.toJSONString(weChatWebhook));
- String post = HttpUtil.sendPostJsonBody(WECHAT_URL, JSON.toJSONString(weChatWebhook));
- log.info("企业微信发送结果 post {}", post);
- return JSON.toJSONString(post);
- }
-
- /**
- * 将列表内容追加到字符串构建器中
- *
- * @param stringBuilder 字符串构建器
- * @param prefix 前缀
- * @param list 列表内容
- */
- private void appendListContent(StringBuilder stringBuilder, String prefix, List list) {
- if (!list.isEmpty()) {
- stringBuilder.append(prefix);
- for (int i = 0; i < list.size(); i++) {
- stringBuilder.append((i + 1)).append("、").append(list.get(i)).append("\n");
- }
- stringBuilder.append("] , \n");
- }
- }
-}
diff --git a/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/utils/HttpUtil.java b/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/utils/HttpUtil.java
deleted file mode 100644
index 3c391919..00000000
--- a/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/utils/HttpUtil.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.springboot101.utils;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.protocol.HTTP;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-
-/**
- * @Auther: 公众号：程序员小富
- * @Date: 2021/5/24 20:40
- * @Description:
- */
-@Component
-
-public class HttpUtil {
- private static final Logger log = LoggerFactory.getLogger(HttpUtil.class);
-
- /**
- * 发送post请求
- *
- * @param url 请求的url
- * @param body json串
- * @return
- */
- public static String sendPostJsonBody(String url, String body) {
- log.debug("[HttpClientUtil][sendPostJsonBody] 入参 url={} body={}", url, body);
- HttpPost httpPost = new HttpPost(url);
- httpPost.addHeader(HTTP.CONTENT_TYPE, "application/json;charset=utf-8");
- StringEntity entity = new StringEntity(body, "utf-8");
- entity.setContentEncoding("UTF-8");
- entity.setContentType("application/json");
- httpPost.setEntity(entity);
- HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
- try {
- HttpClient client = httpClientBuilder.build();
- HttpResponse response = client.execute(httpPost);
- if (response.getStatusLine() != null && response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
- String result = EntityUtils.toString(response.getEntity(), "utf-8");
- log.debug("[HttpClientUtil][sendPostJsonBody] 结果 url={} result={}", url, result);
- return result;
- }
- log.warn("[HttpClientUtil][sendPostJsonBody] 请求失败 response={}", response.toString());
- return "";
- } catch (IOException ex) {
- log.error("[HttpClientUtil][sendPostJsonBody] 请求异常 ex={}", url, ex);
- return "";
- }
- }
-}
diff --git a/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/vo/GithubUser.java b/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/vo/GithubUser.java
deleted file mode 100644
index 0535811f..00000000
--- a/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/vo/GithubUser.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.springboot101.vo;
-
-import lombok.Data;
-
-@Data
-public class GithubUser {
-
-
- /**
- * login : chengxy-nds
- * id : 12745094
- * node_id : MDQ6VXNlcjEyNzQ1MDk0
- * avatar_url : https://avatars.githubusercontent.com/u/12745094?v=4
- * gravatar_id :
- * url : https://api.github.com/users/chengxy-nds
- * html_url : https://github.com/chengxy-nds
- * followers_url : https://api.github.com/users/chengxy-nds/followers
- * following_url : https://api.github.com/users/chengxy-nds/following{/other_user}
- * gists_url : https://api.github.com/users/chengxy-nds/gists{/gist_id}
- * starred_url : https://api.github.com/users/chengxy-nds/starred{/owner}{/repo}
- * subscriptions_url : https://api.github.com/users/chengxy-nds/subscriptions
- * organizations_url : https://api.github.com/users/chengxy-nds/orgs
- * repos_url : https://api.github.com/users/chengxy-nds/repos
- * events_url : https://api.github.com/users/chengxy-nds/events{/privacy}
- * received_events_url : https://api.github.com/users/chengxy-nds/received_events
- * type : User
- * site_admin : false
- * name : 程序员小富
- * company : null
- * blog :
- * location : null
- * email : null
- * hireable : null
- * bio : 公众号：程序员小富
- * twitter_username : null
- * public_repos : 6
- * public_gists : 0
- * followers : 73
- * following : 0
- * created_at : 2015-06-04T09:22:44Z
- * updated_at : 2021-05-29T04:09:56Z
- */
-
- private String login;
- private int id;
- private String node_id;
- private String avatar_url;
- private String gravatar_id;
- private String url;
- private String html_url;
- private String followers_url;
- private String following_url;
- private String gists_url;
- private String starred_url;
- private String subscriptions_url;
- private String organizations_url;
- private String repos_url;
- private String events_url;
- private String received_events_url;
- private String type;
- private boolean site_admin;
- private String name;
- private Object company;
- private String blog;
- private Object location;
- private Object email;
- private Object hireable;
- private String bio;
- private Object twitter_username;
- private int public_repos;
- private int public_gists;
- private int followers;
- private int following;
- private String created_at;
- private String updated_at;
-}
diff --git a/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/vo/GithubWebhookPullVo.java b/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/vo/GithubWebhookPullVo.java
deleted file mode 100644
index 1f8c4463..00000000
--- a/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/vo/GithubWebhookPullVo.java
+++ /dev/null
@@ -1,1185 +0,0 @@
-package com.springboot101.vo;//package com.springboot101.webhook.vo;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author 公众号：程序员小富
- * @Description:程序员小富
- * @date 2021/05/19
- */
-@NoArgsConstructor
-public class GithubWebhookPullVo {
- @JsonProperty("ref")
- private String ref;
- @JsonProperty("before")
- private String before;
- @JsonProperty("after")
- private String after;
- @JsonProperty("repository")
- private RepositoryDTO repository;
- @JsonProperty("pusher")
- private PusherDTO pusher;
- @JsonProperty("sender")
- private SenderDTO sender;
- @JsonProperty("created")
- private Boolean created;
- @JsonProperty("deleted")
- private Boolean deleted;
- @JsonProperty("forced")
- private Boolean forced;
- @JsonProperty("base_ref")
- private Object baseRef;
- @JsonProperty("compare")
- private String compare;
- @JsonProperty("commits")
- private List commits;
- @JsonProperty("head_commit")
- private HeadCommitDTO headCommit;
-
- public String getRef() {
- return ref;
- }
-
- @NoArgsConstructor
- @Data
- public static class PusherDTO {
- @JsonProperty("name")
- private String name;
- @JsonProperty("email")
- private String email;
- }
-
- @NoArgsConstructor
- @Data
- public static class SenderDTO {
- @JsonProperty("login")
- private String login;
- @JsonProperty("id")
- private Integer id;
- @JsonProperty("node_id")
- private String nodeId;
- @JsonProperty("avatar_url")
- private String avatarUrl;
- @JsonProperty("gravatar_id")
- private String gravatarId;
- @JsonProperty("url")
- private String url;
- @JsonProperty("html_url")
- private String htmlUrl;
- @JsonProperty("followers_url")
- private String followersUrl;
- @JsonProperty("following_url")
- private String followingUrl;
- @JsonProperty("gists_url")
- private String gistsUrl;
- @JsonProperty("starred_url")
- private String starredUrl;
- @JsonProperty("subscriptions_url")
- private String subscriptionsUrl;
- @JsonProperty("organizations_url")
- private String organizationsUrl;
- @JsonProperty("repos_url")
- private String reposUrl;
- @JsonProperty("events_url")
- private String eventsUrl;
- @JsonProperty("received_events_url")
- private String receivedEventsUrl;
- @JsonProperty("type")
- private String type;
- @JsonProperty("site_admin")
- private Boolean siteAdmin;
- }
-
- @NoArgsConstructor
- @Data
- public static class HeadCommitDTO {
- @JsonProperty("id")
- private String id;
- @JsonProperty("tree_id")
- private String treeId;
- @JsonProperty("distinct")
- private Boolean distinct;
- @JsonProperty("message")
- private String message;
- @JsonProperty("timestamp")
- private String timestamp;
- @JsonProperty("url")
- private String url;
- @JsonProperty("author")
- private AuthorDTO author;
- @JsonProperty("committer")
- private CommitterDTO committer;
- @JsonProperty("added")
- private List added;
- @JsonProperty("removed")
- private List removed;
- @JsonProperty("modified")
- private List modified;
-
- @NoArgsConstructor
- @Data
- public static class AuthorDTO {
- @JsonProperty("name")
- private String name;
- @JsonProperty("email")
- private String email;
- }
-
- @NoArgsConstructor
- @Data
- public static class CommitterDTO {
- @JsonProperty("name")
- private String name;
- @JsonProperty("email")
- private String email;
- }
- }
-
- public void setRef(String ref) {
- this.ref = ref;
- }
-
- public String getBefore() {
- return before;
- }
-
- public void setBefore(String before) {
- this.before = before;
- }
-
- public String getAfter() {
- return after;
- }
-
- public void setAfter(String after) {
- this.after = after;
- }
-
- public RepositoryDTO getRepository() {
- return repository;
- }
-
- public void setRepository(RepositoryDTO repository) {
- this.repository = repository;
- }
-
- public PusherDTO getPusher() {
- return pusher;
- }
-
- public void setPusher(PusherDTO pusher) {
- this.pusher = pusher;
- }
-
- public SenderDTO getSender() {
- return sender;
- }
-
- public void setSender(SenderDTO sender) {
- this.sender = sender;
- }
-
- public Boolean getCreated() {
- return created;
- }
-
- public void setCreated(Boolean created) {
- this.created = created;
- }
-
- public Boolean getDeleted() {
- return deleted;
- }
-
- public void setDeleted(Boolean deleted) {
- this.deleted = deleted;
- }
-
- public Boolean getForced() {
- return forced;
- }
-
- public void setForced(Boolean forced) {
- this.forced = forced;
- }
-
- public Object getBaseRef() {
- return baseRef;
- }
-
- public void setBaseRef(Object baseRef) {
- this.baseRef = baseRef;
- }
-
- public String getCompare() {
- return compare;
- }
-
- public void setCompare(String compare) {
- this.compare = compare;
- }
-
- public List getCommits() {
- return commits;
- }
-
- public void setCommits(List commits) {
- this.commits = commits;
- }
-
- public HeadCommitDTO getHeadCommit() {
- return headCommit;
- }
-
- public void setHeadCommit(HeadCommitDTO headCommit) {
- this.headCommit = headCommit;
- }
-
- public static class RepositoryDTO {
- @JsonProperty("id")
- private Integer id;
- @JsonProperty("node_id")
- private String nodeId;
- @JsonProperty("name")
- private String name;
- @JsonProperty("full_name")
- private String fullName;
- @JsonProperty("private")
- private Boolean privateX;
- @JsonProperty("owner")
- private OwnerDTO owner;
- @JsonProperty("html_url")
- private String htmlUrl;
- @JsonProperty("description")
- private String description;
- @JsonProperty("fork")
- private Boolean fork;
- @JsonProperty("url")
- private String url;
- @JsonProperty("forks_url")
- private String forksUrl;
- @JsonProperty("keys_url")
- private String keysUrl;
- @JsonProperty("collaborators_url")
- private String collaboratorsUrl;
- @JsonProperty("teams_url")
- private String teamsUrl;
- @JsonProperty("hooks_url")
- private String hooksUrl;
- @JsonProperty("issue_events_url")
- private String issueEventsUrl;
- @JsonProperty("events_url")
- private String eventsUrl;
- @JsonProperty("assignees_url")
- private String assigneesUrl;
- @JsonProperty("branches_url")
- private String branchesUrl;
- @JsonProperty("tags_url")
- private String tagsUrl;
- @JsonProperty("blobs_url")
- private String blobsUrl;
- @JsonProperty("git_tags_url")
- private String gitTagsUrl;
- @JsonProperty("git_refs_url")
- private String gitRefsUrl;
- @JsonProperty("trees_url")
- private String treesUrl;
- @JsonProperty("statuses_url")
- private String statusesUrl;
- @JsonProperty("languages_url")
- private String languagesUrl;
- @JsonProperty("stargazers_url")
- private String stargazersUrl;
- @JsonProperty("contributors_url")
- private String contributorsUrl;
- @JsonProperty("subscribers_url")
- private String subscribersUrl;
- @JsonProperty("subscription_url")
- private String subscriptionUrl;
- @JsonProperty("commits_url")
- private String commitsUrl;
- @JsonProperty("git_commits_url")
- private String gitCommitsUrl;
- @JsonProperty("comments_url")
- private String commentsUrl;
- @JsonProperty("issue_comment_url")
- private String issueCommentUrl;
- @JsonProperty("contents_url")
- private String contentsUrl;
- @JsonProperty("compare_url")
- private String compareUrl;
- @JsonProperty("merges_url")
- private String mergesUrl;
- @JsonProperty("archive_url")
- private String archiveUrl;
- @JsonProperty("downloads_url")
- private String downloadsUrl;
- @JsonProperty("issues_url")
- private String issuesUrl;
- @JsonProperty("pulls_url")
- private String pullsUrl;
- @JsonProperty("milestones_url")
- private String milestonesUrl;
- @JsonProperty("notifications_url")
- private String notificationsUrl;
- @JsonProperty("labels_url")
- private String labelsUrl;
- @JsonProperty("releases_url")
- private String releasesUrl;
- @JsonProperty("deployments_url")
- private String deploymentsUrl;
- @JsonProperty("created_at")
- private Integer createdAt;
- @JsonProperty("updated_at")
- private String updatedAt;
- @JsonProperty("pushed_at")
- private Integer pushedAt;
- @JsonProperty("git_url")
- private String gitUrl;
- @JsonProperty("ssh_url")
- private String sshUrl;
- @JsonProperty("clone_url")
- private String cloneUrl;
- @JsonProperty("svn_url")
- private String svnUrl;
- @JsonProperty("homepage")
- private String homepage;
- @JsonProperty("size")
- private Integer size;
- @JsonProperty("stargazers_count")
- private Integer stargazersCount;
- @JsonProperty("watchers_count")
- private Integer watchersCount;
- @JsonProperty("language")
- private String language;
- @JsonProperty("has_issues")
- private Boolean hasIssues;
- @JsonProperty("has_projects")
- private Boolean hasProjects;
- @JsonProperty("has_downloads")
- private Boolean hasDownloads;
- @JsonProperty("has_wiki")
- private Boolean hasWiki;
- @JsonProperty("has_pages")
- private Boolean hasPages;
- @JsonProperty("forks_count")
- private Integer forksCount;
- @JsonProperty("mirror_url")
- private Object mirrorUrl;
- @JsonProperty("archived")
- private Boolean archived;
- @JsonProperty("disabled")
- private Boolean disabled;
- @JsonProperty("open_issues_count")
- private Integer openIssuesCount;
- @JsonProperty("license")
- private Object license;
- @JsonProperty("forks")
- private Integer forks;
- @JsonProperty("open_issues")
- private Integer openIssues;
- @JsonProperty("watchers")
- private Integer watchers;
- @JsonProperty("default_branch")
- private String defaultBranch;
- @JsonProperty("stargazers")
- private Integer stargazers;
- @JsonProperty("master_branch")
- private String masterBranch;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getNodeId() {
- return nodeId;
- }
-
- public void setNodeId(String nodeId) {
- this.nodeId = nodeId;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getFullName() {
- return fullName;
- }
-
- public void setFullName(String fullName) {
- this.fullName = fullName;
- }
-
- public Boolean getPrivateX() {
- return privateX;
- }
-
- public void setPrivateX(Boolean privateX) {
- this.privateX = privateX;
- }
-
- public OwnerDTO getOwner() {
- return owner;
- }
-
- public void setOwner(OwnerDTO owner) {
- this.owner = owner;
- }
-
- public String getHtmlUrl() {
- return htmlUrl;
- }
-
- public void setHtmlUrl(String htmlUrl) {
- this.htmlUrl = htmlUrl;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public Boolean getFork() {
- return fork;
- }
-
- public void setFork(Boolean fork) {
- this.fork = fork;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getForksUrl() {
- return forksUrl;
- }
-
- public void setForksUrl(String forksUrl) {
- this.forksUrl = forksUrl;
- }
-
- public String getKeysUrl() {
- return keysUrl;
- }
-
- public void setKeysUrl(String keysUrl) {
- this.keysUrl = keysUrl;
- }
-
- public String getCollaboratorsUrl() {
- return collaboratorsUrl;
- }
-
- public void setCollaboratorsUrl(String collaboratorsUrl) {
- this.collaboratorsUrl = collaboratorsUrl;
- }
-
- public String getTeamsUrl() {
- return teamsUrl;
- }
-
- public void setTeamsUrl(String teamsUrl) {
- this.teamsUrl = teamsUrl;
- }
-
- public String getHooksUrl() {
- return hooksUrl;
- }
-
- public void setHooksUrl(String hooksUrl) {
- this.hooksUrl = hooksUrl;
- }
-
- public String getIssueEventsUrl() {
- return issueEventsUrl;
- }
-
- public void setIssueEventsUrl(String issueEventsUrl) {
- this.issueEventsUrl = issueEventsUrl;
- }
-
- public String getEventsUrl() {
- return eventsUrl;
- }
-
- public void setEventsUrl(String eventsUrl) {
- this.eventsUrl = eventsUrl;
- }
-
- public String getAssigneesUrl() {
- return assigneesUrl;
- }
-
- public void setAssigneesUrl(String assigneesUrl) {
- this.assigneesUrl = assigneesUrl;
- }
-
- public String getBranchesUrl() {
- return branchesUrl;
- }
-
- public void setBranchesUrl(String branchesUrl) {
- this.branchesUrl = branchesUrl;
- }
-
- public String getTagsUrl() {
- return tagsUrl;
- }
-
- public void setTagsUrl(String tagsUrl) {
- this.tagsUrl = tagsUrl;
- }
-
- public String getBlobsUrl() {
- return blobsUrl;
- }
-
- public void setBlobsUrl(String blobsUrl) {
- this.blobsUrl = blobsUrl;
- }
-
- public String getGitTagsUrl() {
- return gitTagsUrl;
- }
-
- public void setGitTagsUrl(String gitTagsUrl) {
- this.gitTagsUrl = gitTagsUrl;
- }
-
- public String getGitRefsUrl() {
- return gitRefsUrl;
- }
-
- public void setGitRefsUrl(String gitRefsUrl) {
- this.gitRefsUrl = gitRefsUrl;
- }
-
- public String getTreesUrl() {
- return treesUrl;
- }
-
- public void setTreesUrl(String treesUrl) {
- this.treesUrl = treesUrl;
- }
-
- public String getStatusesUrl() {
- return statusesUrl;
- }
-
- public void setStatusesUrl(String statusesUrl) {
- this.statusesUrl = statusesUrl;
- }
-
- public String getLanguagesUrl() {
- return languagesUrl;
- }
-
- public void setLanguagesUrl(String languagesUrl) {
- this.languagesUrl = languagesUrl;
- }
-
- public String getStargazersUrl() {
- return stargazersUrl;
- }
-
- public void setStargazersUrl(String stargazersUrl) {
- this.stargazersUrl = stargazersUrl;
- }
-
- public String getContributorsUrl() {
- return contributorsUrl;
- }
-
- public void setContributorsUrl(String contributorsUrl) {
- this.contributorsUrl = contributorsUrl;
- }
-
- public String getSubscribersUrl() {
- return subscribersUrl;
- }
-
- public void setSubscribersUrl(String subscribersUrl) {
- this.subscribersUrl = subscribersUrl;
- }
-
- public String getSubscriptionUrl() {
- return subscriptionUrl;
- }
-
- public void setSubscriptionUrl(String subscriptionUrl) {
- this.subscriptionUrl = subscriptionUrl;
- }
-
- public String getCommitsUrl() {
- return commitsUrl;
- }
-
- public void setCommitsUrl(String commitsUrl) {
- this.commitsUrl = commitsUrl;
- }
-
- public String getGitCommitsUrl() {
- return gitCommitsUrl;
- }
-
- public void setGitCommitsUrl(String gitCommitsUrl) {
- this.gitCommitsUrl = gitCommitsUrl;
- }
-
- public String getCommentsUrl() {
- return commentsUrl;
- }
-
- public void setCommentsUrl(String commentsUrl) {
- this.commentsUrl = commentsUrl;
- }
-
- public String getIssueCommentUrl() {
- return issueCommentUrl;
- }
-
- public void setIssueCommentUrl(String issueCommentUrl) {
- this.issueCommentUrl = issueCommentUrl;
- }
-
- public String getContentsUrl() {
- return contentsUrl;
- }
-
- public void setContentsUrl(String contentsUrl) {
- this.contentsUrl = contentsUrl;
- }
-
- public String getCompareUrl() {
- return compareUrl;
- }
-
- public void setCompareUrl(String compareUrl) {
- this.compareUrl = compareUrl;
- }
-
- public String getMergesUrl() {
- return mergesUrl;
- }
-
- public void setMergesUrl(String mergesUrl) {
- this.mergesUrl = mergesUrl;
- }
-
- public String getArchiveUrl() {
- return archiveUrl;
- }
-
- public void setArchiveUrl(String archiveUrl) {
- this.archiveUrl = archiveUrl;
- }
-
- public String getDownloadsUrl() {
- return downloadsUrl;
- }
-
- public void setDownloadsUrl(String downloadsUrl) {
- this.downloadsUrl = downloadsUrl;
- }
-
- public String getIssuesUrl() {
- return issuesUrl;
- }
-
- public void setIssuesUrl(String issuesUrl) {
- this.issuesUrl = issuesUrl;
- }
-
- public String getPullsUrl() {
- return pullsUrl;
- }
-
- public void setPullsUrl(String pullsUrl) {
- this.pullsUrl = pullsUrl;
- }
-
- public String getMilestonesUrl() {
- return milestonesUrl;
- }
-
- public void setMilestonesUrl(String milestonesUrl) {
- this.milestonesUrl = milestonesUrl;
- }
-
- public String getNotificationsUrl() {
- return notificationsUrl;
- }
-
- public void setNotificationsUrl(String notificationsUrl) {
- this.notificationsUrl = notificationsUrl;
- }
-
- public String getLabelsUrl() {
- return labelsUrl;
- }
-
- public void setLabelsUrl(String labelsUrl) {
- this.labelsUrl = labelsUrl;
- }
-
- public String getReleasesUrl() {
- return releasesUrl;
- }
-
- public void setReleasesUrl(String releasesUrl) {
- this.releasesUrl = releasesUrl;
- }
-
- public String getDeploymentsUrl() {
- return deploymentsUrl;
- }
-
- public void setDeploymentsUrl(String deploymentsUrl) {
- this.deploymentsUrl = deploymentsUrl;
- }
-
- public Integer getCreatedAt() {
- return createdAt;
- }
-
- public void setCreatedAt(Integer createdAt) {
- this.createdAt = createdAt;
- }
-
- public String getUpdatedAt() {
- return updatedAt;
- }
-
- public void setUpdatedAt(String updatedAt) {
- this.updatedAt = updatedAt;
- }
-
- public Integer getPushedAt() {
- return pushedAt;
- }
-
- public void setPushedAt(Integer pushedAt) {
- this.pushedAt = pushedAt;
- }
-
- public String getGitUrl() {
- return gitUrl;
- }
-
- public void setGitUrl(String gitUrl) {
- this.gitUrl = gitUrl;
- }
-
- public String getSshUrl() {
- return sshUrl;
- }
-
- public void setSshUrl(String sshUrl) {
- this.sshUrl = sshUrl;
- }
-
- public String getCloneUrl() {
- return cloneUrl;
- }
-
- public void setCloneUrl(String cloneUrl) {
- this.cloneUrl = cloneUrl;
- }
-
- public String getSvnUrl() {
- return svnUrl;
- }
-
- public void setSvnUrl(String svnUrl) {
- this.svnUrl = svnUrl;
- }
-
- public String getHomepage() {
- return homepage;
- }
-
- public void setHomepage(String homepage) {
- this.homepage = homepage;
- }
-
- public Integer getSize() {
- return size;
- }
-
- public void setSize(Integer size) {
- this.size = size;
- }
-
- public Integer getStargazersCount() {
- return stargazersCount;
- }
-
- public void setStargazersCount(Integer stargazersCount) {
- this.stargazersCount = stargazersCount;
- }
-
- public Integer getWatchersCount() {
- return watchersCount;
- }
-
- public void setWatchersCount(Integer watchersCount) {
- this.watchersCount = watchersCount;
- }
-
- public String getLanguage() {
- return language;
- }
-
- public void setLanguage(String language) {
- this.language = language;
- }
-
- public Boolean getHasIssues() {
- return hasIssues;
- }
-
- public void setHasIssues(Boolean hasIssues) {
- this.hasIssues = hasIssues;
- }
-
- public Boolean getHasProjects() {
- return hasProjects;
- }
-
- public void setHasProjects(Boolean hasProjects) {
- this.hasProjects = hasProjects;
- }
-
- public Boolean getHasDownloads() {
- return hasDownloads;
- }
-
- public void setHasDownloads(Boolean hasDownloads) {
- this.hasDownloads = hasDownloads;
- }
-
- public Boolean getHasWiki() {
- return hasWiki;
- }
-
- public void setHasWiki(Boolean hasWiki) {
- this.hasWiki = hasWiki;
- }
-
- public Boolean getHasPages() {
- return hasPages;
- }
-
- public void setHasPages(Boolean hasPages) {
- this.hasPages = hasPages;
- }
-
- public Integer getForksCount() {
- return forksCount;
- }
-
- public void setForksCount(Integer forksCount) {
- this.forksCount = forksCount;
- }
-
- public Object getMirrorUrl() {
- return mirrorUrl;
- }
-
- public void setMirrorUrl(Object mirrorUrl) {
- this.mirrorUrl = mirrorUrl;
- }
-
- public Boolean getArchived() {
- return archived;
- }
-
- public void setArchived(Boolean archived) {
- this.archived = archived;
- }
-
- public Boolean getDisabled() {
- return disabled;
- }
-
- public void setDisabled(Boolean disabled) {
- this.disabled = disabled;
- }
-
- public Integer getOpenIssuesCount() {
- return openIssuesCount;
- }
-
- public void setOpenIssuesCount(Integer openIssuesCount) {
- this.openIssuesCount = openIssuesCount;
- }
-
- public Object getLicense() {
- return license;
- }
-
- public void setLicense(Object license) {
- this.license = license;
- }
-
- public Integer getForks() {
- return forks;
- }
-
- public void setForks(Integer forks) {
- this.forks = forks;
- }
-
- public Integer getOpenIssues() {
- return openIssues;
- }
-
- public void setOpenIssues(Integer openIssues) {
- this.openIssues = openIssues;
- }
-
- public Integer getWatchers() {
- return watchers;
- }
-
- public void setWatchers(Integer watchers) {
- this.watchers = watchers;
- }
-
- public String getDefaultBranch() {
- return defaultBranch;
- }
-
- public void setDefaultBranch(String defaultBranch) {
- this.defaultBranch = defaultBranch;
- }
-
- public Integer getStargazers() {
- return stargazers;
- }
-
- public void setStargazers(Integer stargazers) {
- this.stargazers = stargazers;
- }
-
- public String getMasterBranch() {
- return masterBranch;
- }
-
- public void setMasterBranch(String masterBranch) {
- this.masterBranch = masterBranch;
- }
-
- @NoArgsConstructor
- @Data
- public static class OwnerDTO {
- @JsonProperty("name")
- private String name;
- @JsonProperty("email")
- private String email;
- @JsonProperty("login")
- private String login;
- @JsonProperty("id")
- private Integer id;
- @JsonProperty("node_id")
- private String nodeId;
- @JsonProperty("avatar_url")
- private String avatarUrl;
- @JsonProperty("gravatar_id")
- private String gravatarId;
- @JsonProperty("url")
- private String url;
- @JsonProperty("html_url")
- private String htmlUrl;
- @JsonProperty("followers_url")
- private String followersUrl;
- @JsonProperty("following_url")
- private String followingUrl;
- @JsonProperty("gists_url")
- private String gistsUrl;
- @JsonProperty("starred_url")
- private String starredUrl;
- @JsonProperty("subscriptions_url")
- private String subscriptionsUrl;
- @JsonProperty("organizations_url")
- private String organizationsUrl;
- @JsonProperty("repos_url")
- private String reposUrl;
- @JsonProperty("events_url")
- private String eventsUrl;
- @JsonProperty("received_events_url")
- private String receivedEventsUrl;
- @JsonProperty("type")
- private String type;
- @JsonProperty("site_admin")
- private Boolean siteAdmin;
- }
- }
-
- @NoArgsConstructor
- public static class CommitsDTO {
- @JsonProperty("id")
- private String id;
- @JsonProperty("tree_id")
- private String treeId;
- @JsonProperty("distinct")
- private Boolean distinct;
- @JsonProperty("message")
- private String message;
- @JsonProperty("timestamp")
- private String timestamp;
- @JsonProperty("url")
- private String url;
- @JsonProperty("author")
- private AuthorDTO author;
- @JsonProperty("committer")
- private CommitterDTO committer;
- @JsonProperty("added")
- private List added;
- @JsonProperty("removed")
- private List removed;
- @JsonProperty("modified")
- private List modified;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getTreeId() {
- return treeId;
- }
-
- public void setTreeId(String treeId) {
- this.treeId = treeId;
- }
-
- public Boolean getDistinct() {
- return distinct;
- }
-
- public void setDistinct(Boolean distinct) {
- this.distinct = distinct;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public String getTimestamp() {
- return timestamp;
- }
-
- public void setTimestamp(String timestamp) {
- this.timestamp = timestamp;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public AuthorDTO getAuthor() {
- return author;
- }
-
- public void setAuthor(AuthorDTO author) {
- this.author = author;
- }
-
- public CommitterDTO getCommitter() {
- return committer;
- }
-
- public void setCommitter(CommitterDTO committer) {
- this.committer = committer;
- }
-
- public List getAdded() {
- return added;
- }
-
- public void setAdded(List added) {
- this.added = added;
- }
-
- public List getRemoved() {
- return removed;
- }
-
- public void setRemoved(List removed) {
- this.removed = removed;
- }
-
- public List getModified() {
- return modified;
- }
-
- public void setModified(List modified) {
- this.modified = modified;
- }
-
- @NoArgsConstructor
- @Data
- public static class AuthorDTO {
- @JsonProperty("name")
- private String name;
- @JsonProperty("email")
- private String email;
- }
-
- public static class CommitterDTO {
- @JsonProperty("name")
- private String name;
- @JsonProperty("email")
- private String email;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
- }
- }
-}
diff --git a/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/vo/WeChatWebhook.java b/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/vo/WeChatWebhook.java
deleted file mode 100644
index 71de12af..00000000
--- a/springboot101/webhook/springboot-webhook-wechat/src/main/java/com/springboot101/vo/WeChatWebhook.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.springboot101.vo;
-
-import java.util.List;
-
-/**
- * @Auther: 程序员小富
- * @Date: 2021/5/19 20:56
- * @Description:
- */
-public class WeChatWebhook {
-
- private String msgtype;
-
- private TextDTO text;
-
- public String getMsgtype() {
- return msgtype;
- }
-
- public void setMsgtype(String msgtype) {
- this.msgtype = msgtype;
- }
-
- public TextDTO getText() {
- return text;
- }
-
- public void setText(TextDTO text) {
- this.text = text;
- }
-
- public static class TextDTO {
-
- private String content;
-
- private List mentionedList;
-
- private List mentionedMobileList;
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public List getMentionedList() {
- return mentionedList;
- }
-
- public void setMentionedList(List mentionedList) {
- this.mentionedList = mentionedList;
- }
-
- public List getMentionedMobileList() {
- return mentionedMobileList;
- }
-
- public void setMentionedMobileList(List mentionedMobileList) {
- this.mentionedMobileList = mentionedMobileList;
- }
- }
-}
diff --git a/springboot101/webhook/springboot-webhook-wechat/src/main/resources/application.yml b/springboot101/webhook/springboot-webhook-wechat/src/main/resources/application.yml
deleted file mode 100644
index 6e0d8cc2..00000000
--- a/springboot101/webhook/springboot-webhook-wechat/src/main/resources/application.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-server:
- port: 6666
diff --git a/springboot101/webhook/springboot-webhook-wechat/src/main/resources/templates/index.html b/springboot101/webhook/springboot-webhook-wechat/src/main/resources/templates/index.html
deleted file mode 100644
index 7339fa74..00000000
--- a/springboot101/webhook/springboot-webhook-wechat/src/main/resources/templates/index.html
+++ /dev/null
@@ -1,193 +0,0 @@
-
-
-
- 抖音去水印
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/lib/arcsoft-sdk-face-3.0.0.0.jar" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/lib/arcsoft-sdk-face-3.0.0.0.jar"
deleted file mode 100644
index 32120a89..00000000
Binary files "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/lib/arcsoft-sdk-face-3.0.0.0.jar" and /dev/null differ
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/pom.xml" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/pom.xml"
deleted file mode 100644
index 6258dee7..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/pom.xml"
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
- springboot-detect-faces
- 0.0.1-SNAPSHOT
- springboot-detect-faces
-
-
- 1.8
- UTF-8
- UTF-8
- 2.2.10.RELEASE
- 1.4.1.Final
-
-
-
-
- com.arcsoft.face
- arcsoft-sdk-face
- 3.0.0.0
- system
- ${project.basedir}/lib/arcsoft-sdk-face-3.0.0.0.jar
-
-
-
- org.springframework.boot
- spring-boot-starter-data-jpa
-
-
-
- org.springframework.boot
- spring-boot-starter-jdbc
-
-
- cn.hutool
- hutool-all
- 4.6.1
-
-
-
- com.squareup.okhttp3
- okhttp
- 3.14.2
-
-
-
- org.apache.commons
- commons-pool2
- 2.6.0
-
-
-
-
- org.springframework.boot
- spring-boot-starter-thymeleaf
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.8.1
-
- 1.8
- 1.8
- UTF-8
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
- true
- true
- com.springboot101.DetectFacesApplication
- false
-
-
-
- repackage
-
- repackage
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/META-INF/MANIFEST.MF" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/META-INF/MANIFEST.MF"
deleted file mode 100644
index cbc5f1b9..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/META-INF/MANIFEST.MF"
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: com.springboot101.DetectFacesApplication
-
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/base/Resp.java" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/base/Resp.java"
deleted file mode 100644
index d44bbe22..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/base/Resp.java"
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.springboot101.base;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * @author 公众号：程序员小富
- * @description
- * @date 2020/7/24 15:36
- */
-@Data
-@Accessors(chain = true)
-public class Resp implements Serializable {
-
- /**
- * The constant serialVersionUID.
- */
- private static final long serialVersionUID = -1L;
- /**
- * The constant OK_CODE.
- */
- public static final Integer OK_CODE = 200;
- /**
- * The constant OK_MESSAGE.
- */
- public static final String OK_MESSAGE = "OK";
- /**
- * 结果代码（200：成功，-1000：参数验证不通过，其他：系统异常）
- */
- private Integer code;
- /**
- * 结果提示信息
- */
- private String message;
- /**
- * 结果数据
- */
- private T data;
-
- /**
- * Is ok boolean.
- * 是否成功
- * 2xx表示成功
- *
- * @return the boolean
- * @author 公众号：程序员小富
- * @date 2019年02月22日 13时04分11秒
- */
- public boolean isOk() {
- return Integer.valueOf(2).equals(this.getCode() / 100);
- }
-
- /**
- * Ok resp.
- *
- * @param the type parameter
- * @param data the data
- * @return the ret
- * @author 公众号：程序员小富
- * @date 2019年02月14日 19时15分30秒
- */
- public static Resp ok(D data) {
- return new Resp()
- .setCode(OK_CODE)
- .setMessage(OK_MESSAGE)
- .setData(data);
- }
- /**
- * Error resp.
- *
- * @param the type parameter
- * @param code the code
- * @param message the message
- * @return the ret
- * @author 公众号：程序员小富
- * @date 2019年02月14日 19时16分55秒
- */
- public static Resp error(Integer code, String message) {
- return new Resp()
- .setCode(code)
- .setMessage(message);
- }
-
- /**
- * Of resp.
- *
- * @param the type parameter
- * @param code the code
- * @param message the message
- * @param data the data
- * @return the resp
- * @author 公众号：程序员小富
- * @date 2019年02月28日 21时16分17秒
- */
- public static Resp of(Integer code, String message, D data) {
- return of(code, message, data);
- }
-
- /**
- * Error resp.
- *
- * @param the type parameter
- * @param resp the resp
- * @return the resp
- * @author 公众号：程序员小富
- * @date 2019年03月14日 21时09分42秒
- */
- public static Resp error(Resp resp) {
- return Resp.error(resp.getCode(), resp.getMessage());
- }
-}
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/controller/LoginAPIController.java" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/controller/LoginAPIController.java"
deleted file mode 100644
index 6431eb0e..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/controller/LoginAPIController.java"
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.springboot101.controller;
-
-import com.springboot101.base.Resp;
-import com.springboot101.service.FaceEngineService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Controller;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-/**
- * @author 公众号：程序员小富
- * @Description:
- * @date 2021/08/19
- */
-@Slf4j
-@Validated
-@Controller
-@RequestMapping("/login")
-public class LoginAPIController {
-
- @Resource
- private FaceEngineService faceEngineService;
-
- @RequestMapping("/detectFaces")
- @ResponseBody
- public Resp faceDiscern(@RequestParam("file") String file) {
- return Resp.ok(faceEngineService.detectFaces(file));
- }
-
- @RequestMapping("/face")
- public String face() {
- return "face";
- }
-
- @RequestMapping("/index1")
- public String index1() {
- return "index1";
- }
-
- @RequestMapping("/index2")
- public String index2() {
- return "index2";
- }
-}
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/entity/BaseEntity.java" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/entity/BaseEntity.java"
deleted file mode 100644
index b606b330..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/entity/BaseEntity.java"
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.springboot101.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import jdk.nashorn.internal.ir.annotations.Ignore;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.CreationTimestamp;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author 公众号：程序员小富
- * @Description:
- * @date 2021/08/19
- */
-@Data
-@NoArgsConstructor
-@MappedSuperclass
-public abstract class BaseEntity implements Serializable {
-
- private static final long serialVersionUID = 7988377299341530426L;
-
- @Id
- @Ignore
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Column(name = "id")
- private Long id;
-
- /**
- * 创建时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
- @Temporal(TemporalType.TIMESTAMP)
- @CreationTimestamp
- private Date createDate;
-
- /**
- * 更新时间
- */
-// @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
- private Date updateDate;
-
- /**
- * 0:未删除;1:已删除
- */
- @Column(name = "removed")
- private int removed = 0;
-}
\ No newline at end of file
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/entity/User.java" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/entity/User.java"
deleted file mode 100644
index 4e3296e3..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/entity/User.java"
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.springboot101.entity;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.util.Date;
-
-/**
- * 用户
- *
- * @author 公众号：程序员小富
- * @Description: 用户
- * @date 2021/09/15
- */
-@Data
-@Entity
-@DynamicUpdate
-@NoArgsConstructor
-@Table(name = "fire_user")
-public class User extends BaseEntity {
-
- /**
- * 账号
- */
- private String accountId;
-
- /**
- * 用户名
- */
- private String userName;
-
- /**
- * 密码
- */
- private String password;
-
- /**
- * 电子邮件
- */
- private String email;
-
- /**
- * 头像
- */
- private String avatarPath;
-
- /**
- * 是否为管理员
- */
- private boolean isAdmin;
-
- /**
- * 启用状态
- */
- private boolean enabled;
-
- /**
- * 密码重置时间
- */
- private Date pwdResetRime;
-
- /**
- * 个人简介
- */
- private String personalDesc;
-
- /**
- * 人脸识别信息
- */
- private byte[] detectFaces;
-
- /**
- * 未知性别=-1 、男性=0 、女性=1
- */
- private Integer gender = -1;
-
- /**
- * 是否为第一次登录的新用户
- */
- private boolean firstLogin;
-}
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/repository/UserDao.java" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/repository/UserDao.java"
deleted file mode 100644
index 6c2eb536..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/repository/UserDao.java"
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.springboot101.repository;
-
-import com.springboot101.entity.User;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * @author 公众号：程序员小富
- * @Description:
- * @date 2021/10/29
- */
-@Repository
-public interface UserDao extends JpaRepository {
-
-}
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/service/FaceEngineService.java" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/service/FaceEngineService.java"
deleted file mode 100644
index f9a4a037..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/service/FaceEngineService.java"
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.springboot101.service;
-
-
-import com.springboot101.entity.User;
-
-public interface FaceEngineService {
-
- User detectFaces(String file);
-}
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/service/FaceEngineServiceImpl.java" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/service/FaceEngineServiceImpl.java"
deleted file mode 100644
index 24503f12..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/service/FaceEngineServiceImpl.java"
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.springboot101.service;
-
-import cn.hutool.core.codec.Base64;
-import com.alibaba.fastjson.JSON;
-import com.arcsoft.face.*;
-import com.arcsoft.face.enums.DetectMode;
-import com.arcsoft.face.enums.DetectOrient;
-import com.arcsoft.face.enums.ErrorInfo;
-import com.arcsoft.face.toolkit.ImageInfo;
-import com.springboot101.entity.User;
-import com.springboot101.repository.UserDao;
-import com.springboot101.util.Base64Util;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import static com.arcsoft.face.toolkit.ImageFactory.getRGBData;
-
-@Slf4j
-@Component
-public class FaceEngineServiceImpl implements FaceEngineService {
-
- @Resource
- private UserDao userDao;
-
- @Value("${face.appId}")
- private String appId;
-
- @Value("${face.sdkKey}")
- private String sdkKey;
-
- @Value("${face.path}")
- private String path;
-
- public Integer errorCode;
-
- public FaceEngine faceEngine;
-
- @PostConstruct
- public void init() {
-
- faceEngine = new FaceEngine(path);
- /**
- * 激活引擎
- */
- int errorCode = faceEngine.activeOnline(appId, sdkKey);
- log.info("激活引擎 ,errorCode: {}", errorCode);
- if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
- log.error("引擎激活失败,errorCode: {}", errorCode);
- }
- ActiveFileInfo activeFileInfo = new ActiveFileInfo();
- errorCode = faceEngine.getActiveFileInfo(activeFileInfo);
- if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
- log.error("获取激活文件信息失败 ,errorCode: {}", errorCode);
- }
- /**
- * 引擎配置
- */
- com.arcsoft.face.EngineConfiguration engineConfiguration = new com.arcsoft.face.EngineConfiguration();
- engineConfiguration.setDetectMode(DetectMode.ASF_DETECT_MODE_IMAGE);
- engineConfiguration.setDetectFaceOrientPriority(DetectOrient.ASF_OP_ALL_OUT);
- engineConfiguration.setDetectFaceMaxNum(10);
- engineConfiguration.setDetectFaceScaleVal(16);
- /**
- * 功能配置
- */
- FunctionConfiguration functionConfiguration = new FunctionConfiguration();
- functionConfiguration.setSupportAge(true);
- functionConfiguration.setSupportFace3dAngle(true);
- functionConfiguration.setSupportFaceDetect(true);
- functionConfiguration.setSupportFaceRecognition(true);
- functionConfiguration.setSupportGender(true);
- functionConfiguration.setSupportLiveness(true);
- functionConfiguration.setSupportIRLiveness(true);
- engineConfiguration.setFunctionConfiguration(functionConfiguration);
- /**
- * 初始化引擎
- */
- errorCode = faceEngine.init(engineConfiguration);
- if (errorCode != ErrorInfo.MOK.getValue()) {
- log.error("初始化引擎失败 ,errorCode: {}", errorCode);
- }
- }
-
- @Override
- public User detectFaces(String file) {
-
- try {
- // file 字符串转 file 流
- byte[] decode = Base64.decode(Base64Util.base64Process(file));
-
- // 人脸图像检测
- ImageInfo imageInfo = getRGBData(decode);
- List faceInfoList = new ArrayList();
- errorCode = faceEngine.detectFaces(imageInfo.getImageData(), imageInfo.getWidth(), imageInfo.getHeight(), imageInfo.getImageFormat(), faceInfoList);
- log.info("人脸图像检测 ,faceInfoList: {} ,errorCode: {}", JSON.toJSONString(faceInfoList), errorCode);
-
- // 提取人脸特征
- FaceFeature faceFeature = new FaceFeature();
- errorCode = faceEngine.extractFaceFeature(imageInfo.getImageData(), imageInfo.getWidth(), imageInfo.getHeight(), imageInfo.getImageFormat(), faceInfoList.get(0), faceFeature);
- log.info("提取人脸特征大小，getFeatureData: {} ,errorCode：{}", faceFeature.getFeatureData().length, errorCode);
-
- List allUser = userDao.findAll();
- if (!CollectionUtils.isEmpty(allUser)) {
- for (User user : allUser) {
- if (Objects.isNull(user.getDetectFaces())) {
- continue;
- }
- FaceSimilar faceSimilar = new FaceSimilar();
- errorCode = faceEngine.compareFaceFeature(
- getFaceFeatureInstance(faceFeature.getFeatureData()),
- getFaceFeatureInstance(user.getDetectFaces()), faceSimilar);
- log.info("相似度：{}", faceSimilar.getScore());
- if (faceSimilar.getScore() >= 0.8) {
- user.setFirstLogin(false);
- log.info("老用户");
- return user;
- }
- }
- }
- User newUser = createNewUser(faceFeature.getFeatureData());
- newUser.setFirstLogin(true);
- log.info("新用户");
- return newUser;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
-
- /**
- * 人脸识别后-创建新用户
- *
- * @param detectFaces
- * @return
- */
- public User createNewUser(byte[] detectFaces) {
- User currentUser = new User();
- currentUser.setGender(getGender());
- currentUser.setUserName("火书网友");
- currentUser.setAvatarPath("https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fblog%2F201612%2F02%2F20161202182753_ViyLX.thumb.700_0.png&refer=http%3A%2F%2Fb-ssl.duitang.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1638539316&t=3725638b9");
- currentUser.setDetectFaces(detectFaces);
- currentUser.setFirstLogin(true);
- currentUser = userDao.save(currentUser);
- return currentUser;
- }
-
- /**
- * 检测性别
- *
- * @return
- */
- public Integer getGender() {
- List genderInfoList = new ArrayList<>();
- errorCode = faceEngine.getGender(genderInfoList);
- if (!CollectionUtils.isEmpty(genderInfoList)) {
- log.info("性别：{} ,errorCode: {}", genderInfoList.get(0).getGender(), errorCode);
- return genderInfoList.get(0).getGender();
- }
- return -1;
- }
-
- public FaceFeature getFaceFeatureInstance(byte[] detectFaces) {
- FaceFeature faceFeature = new FaceFeature();
- faceFeature.setFeatureData(detectFaces);
- return faceFeature;
- }
-}
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/util/Base64Util.java" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/util/Base64Util.java"
deleted file mode 100644
index bb1e4cf4..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/java/com/springboot101/util/Base64Util.java"
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.springboot101.util;
-
-import org.springframework.util.StringUtils;
-
-/**
- * Base64 工具类
- */
-public class Base64Util {
- private static final char last2byte = (char) Integer.parseInt("00000011", 2);
- private static final char last4byte = (char) Integer.parseInt("00001111", 2);
- private static final char last6byte = (char) Integer.parseInt("00111111", 2);
- private static final char lead6byte = (char) Integer.parseInt("11111100", 2);
- private static final char lead4byte = (char) Integer.parseInt("11110000", 2);
- private static final char lead2byte = (char) Integer.parseInt("11000000", 2);
- private static final char[] encodeTable = new char[]{'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'};
-
- public Base64Util() {
- }
-
- public static String encode(byte[] from) {
- StringBuilder to = new StringBuilder((int) ((double) from.length * 1.34D) + 3);
- int num = 0;
- char currentByte = 0;
-
- int i;
- for (i = 0; i < from.length; ++i) {
- for (num %= 8; num < 8; num += 6) {
- switch (num) {
- case 0:
- currentByte = (char) (from[i] & lead6byte);
- currentByte = (char) (currentByte >>> 2);
- case 1:
- case 3:
- case 5:
- default:
- break;
- case 2:
- currentByte = (char) (from[i] & last6byte);
- break;
- case 4:
- currentByte = (char) (from[i] & last4byte);
- currentByte = (char) (currentByte << 2);
- if (i + 1 < from.length) {
- currentByte = (char) (currentByte | (from[i + 1] & lead2byte) >>> 6);
- }
- break;
- case 6:
- currentByte = (char) (from[i] & last2byte);
- currentByte = (char) (currentByte << 4);
- if (i + 1 < from.length) {
- currentByte = (char) (currentByte | (from[i + 1] & lead4byte) >>> 4);
- }
- }
-
- to.append(encodeTable[currentByte]);
- }
- }
-
- if (to.length() % 4 != 0) {
- for (i = 4 - to.length() % 4; i > 0; --i) {
- to.append("=");
- }
- }
-
- return to.toString();
- }
-
-
- public static String base64Process(String base64Str) {
- if (!StringUtils.isEmpty(base64Str)) {
- String photoBase64 = base64Str.substring(0, 30).toLowerCase();
- int indexOf = photoBase64.indexOf("base64,");
- if (indexOf > 0) {
- base64Str = base64Str.substring(indexOf + 7);
- }
- return base64Str;
- } else {
- return "";
- }
- }
-}
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/application.yml" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/application.yml"
deleted file mode 100644
index 2c8fe89d..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/application.yml"
+++ /dev/null
@@ -1,26 +0,0 @@
-server:
- port: 8081
-spring:
- application:
- name: fire-book
- datasource:
-# type: com.zaxxer.hikari.HikariDataSource
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/face?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
- username: root
- password: sb886684
- jpa:
- generate-ddl: true
- open-in-view: true
- database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
- database: mysql
- hibernate:
- #更新或者创建数据表结构
- ddl-auto: update
- #控制台显示SQL
- show-sql: true
-# 人脸识别-windows
-face:
- appId: #*****
- sdkKey: #*****
- path: D://face
\ No newline at end of file
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/css/face.css" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/css/face.css"
deleted file mode 100644
index 7070f64c..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/css/face.css"
+++ /dev/null
@@ -1,61 +0,0 @@
-.body-bg {
- background: url("../image/login_bg.png");
- position:fixed;
- top: 0;
- left: 0;
- width:100%;
- height:100%;
- min-width: 1000px;
- z-index:-10;
- zoom: 1;
- background-color: #fff;
- background-repeat: no-repeat;
- background-size: cover;
- -webkit-background-size: cover;
- -o-background-size: cover;
- background-position: center 0;
-}
-
-.filmvideo {
- margin: 200px auto;
- width: 800px;
- height: 400px;
- display: block;
- clear: both;
-}
-
-.title {
- text-align: center;
- color: white;
- margin: -50px auto;
- font-size: 18px;
-}
-
-.close {
- width: 0.8rem;
- height: 0.8rem;
- text-align: center;
- margin: -50px auto;
-}
-
-.rect {
- border: 2px solid #0aeb08;
- position: fixed;
- z-index: 3;
-}
-
-.imgpre{
- display: block;
- clear: both;
- position: absolute;
- margin: 200px auto;
- left: 0;
- right: 0;
-}
-
-.video, .canvas {
- margin:200px auto;
- position: absolute;
- left: 0;
- right: 0;
-}
\ No newline at end of file
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/image/login_bg.png" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/image/login_bg.png"
deleted file mode 100644
index 3fb8fd1e..00000000
Binary files "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/image/login_bg.png" and /dev/null differ
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/js/dat.gui.min.js" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/js/dat.gui.min.js"
deleted file mode 100644
index 89251411..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/js/dat.gui.min.js"
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * dat-gui JavaScript Controller Library
- * http://code.google.com/p/dat-gui
- *
- * Copyright 2011 Data Arts Team, Google Creative Lab
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- */
-var dat=dat||{};dat.gui=dat.gui||{};dat.utils=dat.utils||{};dat.controllers=dat.controllers||{};dat.dom=dat.dom||{};dat.color=dat.color||{};dat.utils.css=function(){return{load:function(e,a){var a=a||document,c=a.createElement("link");c.type="text/css";c.rel="stylesheet";c.href=e;a.getElementsByTagName("head")[0].appendChild(c)},inject:function(e,a){var a=a||document,c=document.createElement("style");c.type="text/css";c.innerHTML=e;a.getElementsByTagName("head")[0].appendChild(c)}}}();
-dat.utils.common=function(){var e=Array.prototype.forEach,a=Array.prototype.slice;return{BREAK:{},extend:function(c){this.each(a.call(arguments,1),function(a){for(var f in a)this.isUndefined(a[f])||(c[f]=a[f])},this);return c},defaults:function(c){this.each(a.call(arguments,1),function(a){for(var f in a)this.isUndefined(c[f])&&(c[f]=a[f])},this);return c},compose:function(){var c=a.call(arguments);return function(){for(var d=a.call(arguments),f=c.length-1;f>=0;f--)d=[c[f].apply(this,d)];return d[0]}},
-each:function(a,d,f){if(e&&a.forEach===e)a.forEach(d,f);else if(a.length===a.length+0)for(var b=0,n=a.length;b-1?d.length-d.indexOf(".")-1:0};c.superclass=e;a.extend(c.prototype,e.prototype,{setValue:function(a){if(this.__min!==void 0&&athis.__max)a=this.__max;this.__step!==void 0&&a%this.__step!=0&&(a=Math.round(a/this.__step)*this.__step);return c.superclass.prototype.setValue.call(this,a)},min:function(a){this.__min=a;return this},max:function(a){this.__max=a;return this},step:function(a){this.__step=a;return this}});return c}(dat.controllers.Controller,dat.utils.common);
-dat.controllers.NumberControllerBox=function(e,a,c){var d=function(f,b,e){function h(){var a=parseFloat(l.__input.value);c.isNaN(a)||l.setValue(a)}function j(a){var b=o-a.clientY;l.setValue(l.getValue()+b*l.__impliedStep);o=a.clientY}function m(){a.unbind(window,"mousemove",j);a.unbind(window,"mouseup",m)}this.__truncationSuspended=false;d.superclass.call(this,f,b,e);var l=this,o;this.__input=document.createElement("input");this.__input.setAttribute("type","text");a.bind(this.__input,"change",h);
-a.bind(this.__input,"blur",function(){h();l.__onFinishChange&&l.__onFinishChange.call(l,l.getValue())});a.bind(this.__input,"mousedown",function(b){a.bind(window,"mousemove",j);a.bind(window,"mouseup",m);o=b.clientY});a.bind(this.__input,"keydown",function(a){if(a.keyCode===13)l.__truncationSuspended=true,this.blur(),l.__truncationSuspended=false});this.updateDisplay();this.domElement.appendChild(this.__input)};d.superclass=e;c.extend(d.prototype,e.prototype,{updateDisplay:function(){var a=this.__input,
-b;if(this.__truncationSuspended)b=this.getValue();else{b=this.getValue();var c=Math.pow(10,this.__precision);b=Math.round(b*c)/c}a.value=b;return d.superclass.prototype.updateDisplay.call(this)}});return d}(dat.controllers.NumberController,dat.dom.dom,dat.utils.common);
-dat.controllers.NumberControllerSlider=function(e,a,c,d,f){var b=function(d,c,f,e,l){function o(b){b.preventDefault();var d=a.getOffset(g.__background),c=a.getWidth(g.__background);g.setValue(g.__min+(g.__max-g.__min)*((b.clientX-d.left)/(d.left+c-d.left)));return false}function y(){a.unbind(window,"mousemove",o);a.unbind(window,"mouseup",y);g.__onFinishChange&&g.__onFinishChange.call(g,g.getValue())}b.superclass.call(this,d,c,{min:f,max:e,step:l});var g=this;this.__background=document.createElement("div");
-this.__foreground=document.createElement("div");a.bind(this.__background,"mousedown",function(b){a.bind(window,"mousemove",o);a.bind(window,"mouseup",y);o(b)});a.addClass(this.__background,"slider");a.addClass(this.__foreground,"slider-fg");this.updateDisplay();this.__background.appendChild(this.__foreground);this.domElement.appendChild(this.__background)};b.superclass=e;b.useDefaultStyles=function(){c.inject(f)};d.extend(b.prototype,e.prototype,{updateDisplay:function(){this.__foreground.style.width=
-(this.getValue()-this.__min)/(this.__max-this.__min)*100+"%";return b.superclass.prototype.updateDisplay.call(this)}});return b}(dat.controllers.NumberController,dat.dom.dom,dat.utils.css,dat.utils.common,".slider {\n box-shadow: inset 0 2px 4px rgba(0,0,0,0.15);\n height: 1em;\n border-radius: 1em;\n background-color: #eee;\n padding: 0 0.5em;\n overflow: hidden;\n}\n\n.slider-fg {\n padding: 1px 0 2px 0;\n background-color: #aaa;\n height: 1em;\n margin-left: -0.5em;\n padding-right: 0.5em;\n border-radius: 1em 0 0 1em;\n}\n\n.slider-fg:after {\n display: inline-block;\n border-radius: 1em;\n background-color: #fff;\n border: 1px solid #aaa;\n content: '';\n float: right;\n margin-right: -1em;\n margin-top: -1px;\n height: 0.9em;\n width: 0.9em;\n}");
-dat.controllers.FunctionController=function(e,a,c){var d=function(c,b,e){d.superclass.call(this,c,b);var h=this;this.__button=document.createElement("div");this.__button.innerHTML=e===void 0?"Fire":e;a.bind(this.__button,"click",function(a){a.preventDefault();h.fire();return false});a.addClass(this.__button,"button");this.domElement.appendChild(this.__button)};d.superclass=e;c.extend(d.prototype,e.prototype,{fire:function(){this.__onChange&&this.__onChange.call(this);this.__onFinishChange&&this.__onFinishChange.call(this,
-this.getValue());this.getValue().call(this.object)}});return d}(dat.controllers.Controller,dat.dom.dom,dat.utils.common);
-dat.controllers.BooleanController=function(e,a,c){var d=function(c,b){d.superclass.call(this,c,b);var e=this;this.__prev=this.getValue();this.__checkbox=document.createElement("input");this.__checkbox.setAttribute("type","checkbox");a.bind(this.__checkbox,"change",function(){e.setValue(!e.__prev)},false);this.domElement.appendChild(this.__checkbox);this.updateDisplay()};d.superclass=e;c.extend(d.prototype,e.prototype,{setValue:function(a){a=d.superclass.prototype.setValue.call(this,a);this.__onFinishChange&&
-this.__onFinishChange.call(this,this.getValue());this.__prev=this.getValue();return a},updateDisplay:function(){this.getValue()===true?(this.__checkbox.setAttribute("checked","checked"),this.__checkbox.checked=true):this.__checkbox.checked=false;return d.superclass.prototype.updateDisplay.call(this)}});return d}(dat.controllers.Controller,dat.dom.dom,dat.utils.common);
-dat.color.toString=function(e){return function(a){if(a.a==1||e.isUndefined(a.a)){for(a=a.hex.toString(16);a.length<6;)a="0"+a;return"#"+a}else return"rgba("+Math.round(a.r)+","+Math.round(a.g)+","+Math.round(a.b)+","+a.a+")"}}(dat.utils.common);
-dat.color.interpret=function(e,a){var c,d,f=[{litmus:a.isString,conversions:{THREE_CHAR_HEX:{read:function(a){a=a.match(/^#([A-F0-9])([A-F0-9])([A-F0-9])$/i);return a===null?false:{space:"HEX",hex:parseInt("0x"+a[1].toString()+a[1].toString()+a[2].toString()+a[2].toString()+a[3].toString()+a[3].toString())}},write:e},SIX_CHAR_HEX:{read:function(a){a=a.match(/^#([A-F0-9]{6})$/i);return a===null?false:{space:"HEX",hex:parseInt("0x"+a[1].toString())}},write:e},CSS_RGB:{read:function(a){a=a.match(/^rgb\(\s*(.+)\s*,\s*(.+)\s*,\s*(.+)\s*\)/);
-return a===null?false:{space:"RGB",r:parseFloat(a[1]),g:parseFloat(a[2]),b:parseFloat(a[3])}},write:e},CSS_RGBA:{read:function(a){a=a.match(/^rgba\(\s*(.+)\s*,\s*(.+)\s*,\s*(.+)\s*\,\s*(.+)\s*\)/);return a===null?false:{space:"RGB",r:parseFloat(a[1]),g:parseFloat(a[2]),b:parseFloat(a[3]),a:parseFloat(a[4])}},write:e}}},{litmus:a.isNumber,conversions:{HEX:{read:function(a){return{space:"HEX",hex:a,conversionName:"HEX"}},write:function(a){return a.hex}}}},{litmus:a.isArray,conversions:{RGB_ARRAY:{read:function(a){return a.length!=
-3?false:{space:"RGB",r:a[0],g:a[1],b:a[2]}},write:function(a){return[a.r,a.g,a.b]}},RGBA_ARRAY:{read:function(a){return a.length!=4?false:{space:"RGB",r:a[0],g:a[1],b:a[2],a:a[3]}},write:function(a){return[a.r,a.g,a.b,a.a]}}}},{litmus:a.isObject,conversions:{RGBA_OBJ:{read:function(b){return a.isNumber(b.r)&&a.isNumber(b.g)&&a.isNumber(b.b)&&a.isNumber(b.a)?{space:"RGB",r:b.r,g:b.g,b:b.b,a:b.a}:false},write:function(a){return{r:a.r,g:a.g,b:a.b,a:a.a}}},RGB_OBJ:{read:function(b){return a.isNumber(b.r)&&
-a.isNumber(b.g)&&a.isNumber(b.b)?{space:"RGB",r:b.r,g:b.g,b:b.b}:false},write:function(a){return{r:a.r,g:a.g,b:a.b}}},HSVA_OBJ:{read:function(b){return a.isNumber(b.h)&&a.isNumber(b.s)&&a.isNumber(b.v)&&a.isNumber(b.a)?{space:"HSV",h:b.h,s:b.s,v:b.v,a:b.a}:false},write:function(a){return{h:a.h,s:a.s,v:a.v,a:a.a}}},HSV_OBJ:{read:function(b){return a.isNumber(b.h)&&a.isNumber(b.s)&&a.isNumber(b.v)?{space:"HSV",h:b.h,s:b.s,v:b.v}:false},write:function(a){return{h:a.h,s:a.s,v:a.v}}}}}];return function(){d=
-false;var b=arguments.length>1?a.toArray(arguments):arguments[0];a.each(f,function(e){if(e.litmus(b))return a.each(e.conversions,function(e,f){c=e.read(b);if(d===false&&c!==false)return d=c,c.conversionName=f,c.conversion=e,a.BREAK}),a.BREAK});return d}}(dat.color.toString,dat.utils.common);
-dat.GUI=dat.gui.GUI=function(e,a,c,d,f,b,n,h,j,m,l,o,y,g,i){function q(a,b,r,c){if(b[r]===void 0)throw Error("Object "+b+' has no property "'+r+'"');c.color?b=new l(b,r):(b=[b,r].concat(c.factoryArgs),b=d.apply(a,b));if(c.before instanceof f)c.before=c.before.__li;t(a,b);g.addClass(b.domElement,"c");r=document.createElement("span");g.addClass(r,"property-name");r.innerHTML=b.property;var e=document.createElement("div");e.appendChild(r);e.appendChild(b.domElement);c=s(a,e,c.before);g.addClass(c,k.CLASS_CONTROLLER_ROW);
-g.addClass(c,typeof b.getValue());p(a,c,b);a.__controllers.push(b);return b}function s(a,b,d){var c=document.createElement("li");b&&c.appendChild(b);d?a.__ul.insertBefore(c,params.before):a.__ul.appendChild(c);a.onResize();return c}function p(a,d,c){c.__li=d;c.__gui=a;i.extend(c,{options:function(b){if(arguments.length>1)return c.remove(),q(a,c.object,c.property,{before:c.__li.nextElementSibling,factoryArgs:[i.toArray(arguments)]});if(i.isArray(b)||i.isObject(b))return c.remove(),q(a,c.object,c.property,
-{before:c.__li.nextElementSibling,factoryArgs:[b]})},name:function(a){c.__li.firstElementChild.firstElementChild.innerHTML=a;return c},listen:function(){c.__gui.listen(c);return c},remove:function(){c.__gui.remove(c);return c}});if(c instanceof j){var e=new h(c.object,c.property,{min:c.__min,max:c.__max,step:c.__step});i.each(["updateDisplay","onChange","onFinishChange"],function(a){var b=c[a],H=e[a];c[a]=e[a]=function(){var a=Array.prototype.slice.call(arguments);b.apply(c,a);return H.apply(e,a)}});
-g.addClass(d,"has-slider");c.domElement.insertBefore(e.domElement,c.domElement.firstElementChild)}else if(c instanceof h){var f=function(b){return i.isNumber(c.__min)&&i.isNumber(c.__max)?(c.remove(),q(a,c.object,c.property,{before:c.__li.nextElementSibling,factoryArgs:[c.__min,c.__max,c.__step]})):b};c.min=i.compose(f,c.min);c.max=i.compose(f,c.max)}else if(c instanceof b)g.bind(d,"click",function(){g.fakeEvent(c.__checkbox,"click")}),g.bind(c.__checkbox,"click",function(a){a.stopPropagation()});
-else if(c instanceof n)g.bind(d,"click",function(){g.fakeEvent(c.__button,"click")}),g.bind(d,"mouseover",function(){g.addClass(c.__button,"hover")}),g.bind(d,"mouseout",function(){g.removeClass(c.__button,"hover")});else if(c instanceof l)g.addClass(d,"color"),c.updateDisplay=i.compose(function(a){d.style.borderLeftColor=c.__color.toString();return a},c.updateDisplay),c.updateDisplay();c.setValue=i.compose(function(b){a.getRoot().__preset_select&&c.isModified()&&B(a.getRoot(),true);return b},c.setValue)}
-function t(a,b){var c=a.getRoot(),d=c.__rememberedObjects.indexOf(b.object);if(d!=-1){var e=c.__rememberedObjectIndecesToControllers[d];e===void 0&&(e={},c.__rememberedObjectIndecesToControllers[d]=e);e[b.property]=b;if(c.load&&c.load.remembered){c=c.load.remembered;if(c[a.preset])c=c[a.preset];else if(c[w])c=c[w];else return;if(c[d]&&c[d][b.property]!==void 0)d=c[d][b.property],b.initialValue=d,b.setValue(d)}}}function I(a){var b=a.__save_row=document.createElement("li");g.addClass(a.domElement,
-"has-save");a.__ul.insertBefore(b,a.__ul.firstChild);g.addClass(b,"save-row");var c=document.createElement("span");c.innerHTML=" ";g.addClass(c,"button gears");var d=document.createElement("span");d.innerHTML="Save";g.addClass(d,"button");g.addClass(d,"save");var e=document.createElement("span");e.innerHTML="New";g.addClass(e,"button");g.addClass(e,"save-as");var f=document.createElement("span");f.innerHTML="Revert";g.addClass(f,"button");g.addClass(f,"revert");var m=a.__preset_select=document.createElement("select");
-a.load&&a.load.remembered?i.each(a.load.remembered,function(b,c){C(a,c,c==a.preset)}):C(a,w,false);g.bind(m,"change",function(){for(var b=0;b0){a.preset=this.preset;if(!a.remembered)a.remembered={};a.remembered[this.preset]=z(this)}a.folders={};i.each(this.__folders,function(b,
-c){a.folders[c]=b.getSaveObject()});return a},save:function(){if(!this.load.remembered)this.load.remembered={};this.load.remembered[this.preset]=z(this);B(this,false)},saveAs:function(a){if(!this.load.remembered)this.load.remembered={},this.load.remembered[w]=z(this,true);this.load.remembered[a]=z(this);this.preset=a;C(this,a,true)},revert:function(a){i.each(this.__controllers,function(b){this.getRoot().load.remembered?t(a||this.getRoot(),b):b.setValue(b.initialValue)},this);i.each(this.__folders,
-function(a){a.revert(a)});a||B(this.getRoot(),false)},listen:function(a){var b=this.__listening.length==0;this.__listening.push(a);b&&E(this.__listening)}});return k}(dat.utils.css,'\n\n Here\'s the new load parameter for your
GUI\'s constructor:\n\n
\n\n
\n\n
Automatically save\n values to
localStorage on exit.\n\n
The values saved to localStorage will\n override those passed to dat.GUI\'s constructor. This makes it\n easier to work incrementally, but localStorage is fragile,\n and your friends may not see the same values you do.\n \n
\n \n
\n\n
- * @version v1.0.0
- * @link http://trackingjs.com
- * @license BSD
- */
-tracking.ViolaJones.classifiers.face=new Float64Array([20,20,.822689414024353,3,0,2,3,7,14,4,-1,3,9,14,2,2,.004014195874333382,.0337941907346249,.8378106951713562,0,2,1,2,18,4,-1,7,2,6,4,3,.0151513395830989,.1514132022857666,.7488812208175659,0,2,1,7,15,9,-1,1,10,15,3,3,.004210993181914091,.0900492817163467,.6374819874763489,6.956608772277832,16,0,2,5,6,2,6,-1,5,9,2,3,2,.0016227109590545297,.0693085864186287,.7110946178436279,0,2,7,5,6,3,-1,9,5,2,3,3,.002290664939209819,.1795803010463715,.6668692231178284,0,2,4,0,12,9,-1,4,3,12,3,3,.005002570804208517,.1693672984838486,.6554006934165955,0,2,6,9,10,8,-1,6,13,10,4,2,.007965989410877228,.5866332054138184,.0914145186543465,0,2,3,6,14,8,-1,3,10,14,4,2,-.003522701095789671,.1413166970014572,.6031895875930786,0,2,14,1,6,10,-1,14,1,3,10,2,.0366676896810532,.3675672113895416,.7920318245887756,0,2,7,8,5,12,-1,7,12,5,4,3,.009336147457361221,.6161385774612427,.2088509947061539,0,2,1,1,18,3,-1,7,1,6,3,3,.008696131408214569,.2836230993270874,.6360273957252502,0,2,1,8,17,2,-1,1,9,17,1,2,.0011488880263641477,.2223580926656723,.5800700783729553,0,2,16,6,4,2,-1,16,7,4,1,2,-.002148468978703022,.2406464070081711,.5787054896354675,0,2,5,17,2,2,-1,5,18,2,1,2,.002121906029060483,.5559654831886292,.136223703622818,0,2,14,2,6,12,-1,14,2,3,12,2,-.0939491465687752,.8502737283706665,.4717740118503571,0,3,4,0,4,12,-1,4,0,2,6,2,6,6,2,6,2,.0013777789426967502,.5993673801422119,.2834529876708984,0,2,2,11,18,8,-1,8,11,6,8,3,.0730631574988365,.4341886043548584,.7060034275054932,0,2,5,7,10,2,-1,5,8,10,1,2,.00036767389974556863,.3027887940406799,.6051574945449829,0,2,15,11,5,3,-1,15,12,5,1,3,-.0060479710809886456,.17984339594841,.5675256848335266,9.498542785644531,21,0,2,5,3,10,9,-1,5,6,10,3,3,-.0165106896311045,.6644225120544434,.1424857974052429,0,2,9,4,2,14,-1,9,11,2,7,2,.002705249935388565,.6325352191925049,.1288477033376694,0,2,3,5,4,12,-1,3,9,4,4,3,.002806986914947629,.1240288019180298,.6193193197250366,0,2,4,5,12,5,-1,8,5,4,5,3,-.0015402400167658925,.1432143002748489,.5670015811920166,0,2,5,6,10,8,-1,5,10,10,4,2,-.0005638627917505801,.1657433062791824,.5905207991600037,0,2,8,0,6,9,-1,8,3,6,3,3,.0019253729842603207,.2695507109165192,.5738824009895325,0,2,9,12,1,8,-1,9,16,1,4,2,-.005021484103053808,.1893538981676102,.5782774090766907,0,2,0,7,20,6,-1,0,9,20,2,3,.0026365420781075954,.2309329062700272,.5695425868034363,0,2,7,0,6,17,-1,9,0,2,17,3,-.0015127769438549876,.2759602069854736,.5956642031669617,0,2,9,0,6,4,-1,11,0,2,4,3,-.0101574398577213,.1732538044452667,.5522047281265259,0,2,5,1,6,4,-1,7,1,2,4,3,-.011953660286963,.1339409947395325,.5559014081954956,0,2,12,1,6,16,-1,14,1,2,16,3,.004885949194431305,.3628703951835632,.6188849210739136,0,3,0,5,18,8,-1,0,5,9,4,2,9,9,9,4,2,-.0801329165697098,.0912110507488251,.5475944876670837,0,3,8,15,10,4,-1,13,15,5,2,2,8,17,5,2,2,.0010643280111253262,.3715142905712128,.5711399912834167,0,3,3,1,4,8,-1,3,1,2,4,2,5,5,2,4,2,-.0013419450260698795,.5953313708305359,.331809788942337,0,3,3,6,14,10,-1,10,6,7,5,2,3,11,7,5,2,-.0546011403203011,.1844065934419632,.5602846145629883,0,2,2,1,6,16,-1,4,1,2,16,3,.0029071690514683723,.3594244122505188,.6131715178489685,0,2,0,18,20,2,-1,0,19,20,1,2,.0007471871795132756,.5994353294372559,.3459562957286835,0,2,8,13,4,3,-1,8,14,4,1,3,.004301380831748247,.4172652065753937,.6990845203399658,0,2,9,14,2,3,-1,9,15,2,1,3,.004501757211983204,.4509715139865875,.7801457047462463,0,2,0,12,9,6,-1,0,14,9,2,3,.0241385009139776,.5438212752342224,.1319826990365982,18.4129695892334,39,0,2,5,7,3,4,-1,5,9,3,2,2,.001921223010867834,.1415266990661621,.6199870705604553,0,2,9,3,2,16,-1,9,11,2,8,2,-.00012748669541906565,.6191074252128601,.1884928941726685,0,2,3,6,13,8,-1,3,10,13,4,2,.0005140993162058294,.1487396955490112,.5857927799224854,0,2,12,3,8,2,-1,12,3,4,2,2,.004187860991805792,.2746909856796265,.6359239816665649,0,2,8,8,4,12,-1,8,12,4,4,3,.005101571790874004,.5870851278305054,.2175628989934921,0,3,11,3,8,6,-1,15,3,4,3,2,11,6,4,3,2,-.002144844038411975,.5880944728851318,.2979590892791748,0,2,7,1,6,19,-1,9,1,2,19,3,-.0028977119363844395,.2373327016830444,.5876647233963013,0,2,9,0,6,4,-1,11,0,2,4,3,-.0216106791049242,.1220654994249344,.5194202065467834,0,2,3,1,9,3,-1,6,1,3,3,3,-.004629931878298521,.263123095035553,.5817409157752991,0,3,8,15,10,4,-1,13,15,5,2,2,8,17,5,2,2,.000593937118537724,.363862007856369,.5698544979095459,0,2,0,3,6,10,-1,3,3,3,10,2,.0538786612451077,.4303531050682068,.7559366226196289,0,2,3,4,15,15,-1,3,9,15,5,3,.0018887349870055914,.2122603058815002,.561342716217041,0,2,6,5,8,6,-1,6,7,8,2,3,-.0023635339457541704,.563184916973114,.2642767131328583,0,3,4,4,12,10,-1,10,4,6,5,2,4,9,6,5,2,.0240177996456623,.5797107815742493,.2751705944538117,0,2,6,4,4,4,-1,8,4,2,4,2,.00020543030404951423,.2705242037773132,.575256884098053,0,2,15,11,1,2,-1,15,12,1,1,2,.0008479019743390381,.5435624718666077,.2334876954555512,0,2,3,11,2,2,-1,3,12,2,1,2,.0014091329649090767,.5319424867630005,.2063155025243759,0,2,16,11,1,3,-1,16,12,1,1,3,.0014642629539594054,.5418980717658997,.3068861067295075,0,3,3,15,6,4,-1,3,15,3,2,2,6,17,3,2,2,.0016352549428120255,.3695372939109802,.6112868189811707,0,2,6,7,8,2,-1,6,8,8,1,2,.0008317275205627084,.3565036952495575,.6025236248970032,0,2,3,11,1,3,-1,3,12,1,1,3,-.0020998890977352858,.1913982033729553,.5362827181816101,0,2,6,0,12,2,-1,6,1,12,1,2,-.0007421398186124861,.3835555016994476,.552931010723114,0,2,9,14,2,3,-1,9,15,2,1,3,.0032655049581080675,.4312896132469177,.7101895809173584,0,2,7,15,6,2,-1,7,16,6,1,2,.0008913499186746776,.3984830975532532,.6391963958740234,0,2,0,5,4,6,-1,0,7,4,2,3,-.0152841797098517,.2366732954978943,.5433713793754578,0,2,4,12,12,2,-1,8,12,4,2,3,.004838141147047281,.5817500948905945,.3239189088344574,0,2,6,3,1,9,-1,6,6,1,3,3,-.0009109317907132208,.5540593862533569,.2911868989467621,0,2,10,17,3,2,-1,11,17,1,2,3,-.006127506028860807,.1775255054235458,.5196629166603088,0,2,9,9,2,2,-1,9,10,2,1,2,-.00044576259097084403,.3024170100688934,.5533593893051147,0,2,7,6,6,4,-1,9,6,2,4,3,.0226465407758951,.4414930939674377,.6975377202033997,0,2,7,17,3,2,-1,8,17,1,2,3,-.0018804960418492556,.2791394889354706,.5497952103614807,0,2,10,17,3,3,-1,11,17,1,3,3,.007088910788297653,.5263199210166931,.2385547012090683,0,2,8,12,3,2,-1,8,13,3,1,2,.0017318050377070904,.4319379031658173,.6983600854873657,0,2,9,3,6,2,-1,11,3,2,2,3,-.006848270073533058,.3082042932510376,.5390920042991638,0,2,3,11,14,4,-1,3,13,14,2,2,-15062530110299122e-21,.552192211151123,.3120366036891937,0,3,1,10,18,4,-1,10,10,9,2,2,1,12,9,2,2,.0294755697250366,.5401322841644287,.1770603060722351,0,2,0,10,3,3,-1,0,11,3,1,3,.008138732984662056,.5178617835044861,.121101900935173,0,2,9,1,6,6,-1,11,1,2,6,3,.0209429506212473,.5290294289588928,.3311221897602081,0,2,8,7,3,6,-1,9,7,1,6,3,-.009566552937030792,.7471994161605835,.4451968967914581,15.324139595031738,33,0,2,1,0,18,9,-1,1,3,18,3,3,-.00028206960996612906,.2064086049795151,.6076732277870178,0,2,12,10,2,6,-1,12,13,2,3,2,.00167906004935503,.5851997137069702,.1255383938550949,0,2,0,5,19,8,-1,0,9,19,4,2,.0006982791237533092,.094018429517746,.5728961229324341,0,2,7,0,6,9,-1,9,0,2,9,3,.0007895901217125356,.1781987994909287,.5694308876991272,0,2,5,3,6,1,-1,7,3,2,1,3,-.002856049919500947,.1638399064540863,.5788664817810059,0,2,11,3,6,1,-1,13,3,2,1,3,-.0038122469559311867,.2085440009832382,.5508564710617065,0,2,5,10,4,6,-1,5,13,4,3,2,.0015896620461717248,.5702760815620422,.1857215017080307,0,2,11,3,6,1,-1,13,3,2,1,3,.0100783398374915,.5116943120956421,.2189770042896271,0,2,4,4,12,6,-1,4,6,12,2,3,-.0635263025760651,.7131379842758179,.4043813049793243,0,2,15,12,2,6,-1,15,14,2,2,3,-.009103149175643921,.2567181885242462,.54639732837677,0,2,9,3,2,2,-1,10,3,1,2,2,-.002403500024229288,.1700665950775147,.559097409248352,0,2,9,3,3,1,-1,10,3,1,1,3,.001522636041045189,.5410556793212891,.2619054019451141,0,2,1,1,4,14,-1,3,1,2,14,2,.0179974399507046,.3732436895370483,.6535220742225647,0,3,9,0,4,4,-1,11,0,2,2,2,9,2,2,2,2,-.00645381910726428,.2626481950283051,.5537446141242981,0,2,7,5,1,14,-1,7,12,1,7,2,-.0118807600811124,.2003753930330277,.5544745922088623,0,2,19,0,1,4,-1,19,2,1,2,2,.0012713660253211856,.5591902732849121,.303197592496872,0,2,5,5,6,4,-1,8,5,3,4,2,.0011376109905540943,.2730407118797302,.5646508932113647,0,2,9,18,3,2,-1,10,18,1,2,3,-.00426519988104701,.1405909061431885,.5461820960044861,0,2,8,18,3,2,-1,9,18,1,2,3,-.0029602861031889915,.1795035004615784,.5459290146827698,0,2,4,5,12,6,-1,4,7,12,2,3,-.008844822645187378,.5736783146858215,.280921995639801,0,2,3,12,2,6,-1,3,14,2,2,3,-.006643068976700306,.2370675951242447,.5503826141357422,0,2,10,8,2,12,-1,10,12,2,4,3,.003999780863523483,.5608199834823608,.3304282128810883,0,2,7,18,3,2,-1,8,18,1,2,3,-.004122172016650438,.1640105992555618,.5378993153572083,0,2,9,0,6,2,-1,11,0,2,2,3,.0156249096617103,.5227649211883545,.2288603931665421,0,2,5,11,9,3,-1,5,12,9,1,3,-.0103564197197557,.7016193866729736,.4252927899360657,0,2,9,0,6,2,-1,11,0,2,2,3,-.008796080946922302,.2767347097396851,.5355830192565918,0,2,1,1,18,5,-1,7,1,6,5,3,.1622693985700607,.434224009513855,.744257926940918,0,3,8,0,4,4,-1,10,0,2,2,2,8,2,2,2,2,.0045542530715465546,.5726485848426819,.2582125067710877,0,2,3,12,1,3,-1,3,13,1,1,3,-.002130920998752117,.2106848061084747,.5361018776893616,0,2,8,14,5,3,-1,8,15,5,1,3,-.0132084200158715,.7593790888786316,.4552468061447144,0,3,5,4,10,12,-1,5,4,5,6,2,10,10,5,6,2,-.0659966766834259,.125247597694397,.5344039797782898,0,2,9,6,9,12,-1,9,10,9,4,3,.007914265617728233,.3315384089946747,.5601043105125427,0,3,2,2,12,14,-1,2,2,6,7,2,8,9,6,7,2,.0208942797034979,.5506049990653992,.2768838107585907,21.010639190673828,44,0,2,4,7,12,2,-1,8,7,4,2,3,.0011961159761995077,.1762690991163254,.6156241297721863,0,2,7,4,6,4,-1,7,6,6,2,2,-.0018679830245673656,.6118106842041016,.1832399964332581,0,2,4,5,11,8,-1,4,9,11,4,2,-.00019579799845814705,.0990442633628845,.5723816156387329,0,2,3,10,16,4,-1,3,12,16,2,2,-.0008025565766729414,.5579879879951477,.2377282977104187,0,2,0,0,16,2,-1,0,1,16,1,2,-.0024510810617357492,.2231457978487015,.5858935117721558,0,2,7,5,6,2,-1,9,5,2,2,3,.0005036185029894114,.2653993964195252,.5794103741645813,0,3,3,2,6,10,-1,3,2,3,5,2,6,7,3,5,2,.0040293349884450436,.5803827047348022,.2484865039587021,0,2,10,5,8,15,-1,10,10,8,5,3,-.0144517095759511,.1830351948738098,.5484204888343811,0,3,3,14,8,6,-1,3,14,4,3,2,7,17,4,3,2,.0020380979403853416,.3363558948040009,.6051092743873596,0,2,14,2,2,2,-1,14,3,2,1,2,-.0016155190533027053,.2286642044782639,.5441246032714844,0,2,1,10,7,6,-1,1,13,7,3,2,.0033458340913057327,.5625913143157959,.2392338067293167,0,2,15,4,4,3,-1,15,4,2,3,2,.0016379579901695251,.3906993865966797,.5964621901512146,0,3,2,9,14,6,-1,2,9,7,3,2,9,12,7,3,2,.0302512105554342,.524848222732544,.1575746983289719,0,2,5,7,10,4,-1,5,9,10,2,2,.037251990288496,.4194310903549194,.6748418807983398,0,3,6,9,8,8,-1,6,9,4,4,2,10,13,4,4,2,-.0251097902655602,.1882549971342087,.5473451018333435,0,2,14,1,3,2,-1,14,2,3,1,2,-.005309905856847763,.133997306227684,.5227110981941223,0,2,1,4,4,2,-1,3,4,2,2,2,.0012086479691788554,.3762088119983673,.6109635829925537,0,2,11,10,2,8,-1,11,14,2,4,2,-.0219076797366142,.266314297914505,.5404006838798523,0,2,0,0,5,3,-1,0,1,5,1,3,.0054116579703986645,.5363578796386719,.2232273072004318,0,3,2,5,18,8,-1,11,5,9,4,2,2,9,9,4,2,.069946326315403,.5358232855796814,.2453698068857193,0,2,6,6,1,6,-1,6,9,1,3,2,.00034520021290518343,.2409671992063522,.5376930236816406,0,2,19,1,1,3,-1,19,2,1,1,3,.0012627709656953812,.5425856709480286,.3155693113803864,0,2,7,6,6,6,-1,9,6,2,6,3,.0227195098996162,.4158405959606171,.6597865223884583,0,2,19,1,1,3,-1,19,2,1,1,3,-.001811100053600967,.2811253070831299,.5505244731903076,0,2,3,13,2,3,-1,3,14,2,1,3,.0033469670452177525,.526002824306488,.1891465038061142,0,3,8,4,8,12,-1,12,4,4,6,2,8,10,4,6,2,.00040791751234792173,.5673509240150452,.3344210088253021,0,2,5,2,6,3,-1,7,2,2,3,3,.0127347996458411,.5343592166900635,.2395612001419067,0,2,6,1,9,10,-1,6,6,9,5,2,-.007311972789466381,.6010890007019043,.4022207856178284,0,2,0,4,6,12,-1,2,4,2,12,3,-.0569487512111664,.8199151158332825,.4543190896511078,0,2,15,13,2,3,-1,15,14,2,1,3,-.005011659115552902,.2200281023979187,.5357710719108582,0,2,7,14,5,3,-1,7,15,5,1,3,.006033436860889196,.4413081109523773,.7181751132011414,0,2,15,13,3,3,-1,15,14,3,1,3,.0039437441155314445,.547886073589325,.2791733145713806,0,2,6,14,8,3,-1,6,15,8,1,3,-.0036591119132936,.635786771774292,.3989723920822144,0,2,15,13,3,3,-1,15,14,3,1,3,-.0038456181064248085,.3493686020374298,.5300664901733398,0,2,2,13,3,3,-1,2,14,3,1,3,-.007192626129835844,.1119614988565445,.5229672789573669,0,3,4,7,12,12,-1,10,7,6,6,2,4,13,6,6,2,-.0527989417314529,.2387102991342545,.54534512758255,0,2,9,7,2,6,-1,10,7,1,6,2,-.007953766733407974,.7586917877197266,.4439376890659332,0,2,8,9,5,2,-1,8,10,5,1,2,-.0027344180271029472,.2565476894378662,.5489321947097778,0,2,8,6,3,4,-1,9,6,1,4,3,-.0018507939530536532,.6734347939491272,.4252474904060364,0,2,9,6,2,8,-1,9,10,2,4,2,.0159189198166132,.548835277557373,.2292661964893341,0,2,7,7,3,6,-1,8,7,1,6,3,-.0012687679845839739,.6104331016540527,.4022389948368073,0,2,11,3,3,3,-1,12,3,1,3,3,.006288391072303057,.5310853123664856,.1536193042993546,0,2,5,4,6,1,-1,7,4,2,1,3,-.0062259892001748085,.1729111969470978,.524160623550415,0,2,5,6,10,3,-1,5,7,10,1,3,-.0121325999498367,.659775972366333,.4325182139873505,23.918790817260742,50,0,2,7,3,6,9,-1,7,6,6,3,3,-.0039184908382594585,.6103435158729553,.1469330936670303,0,2,6,7,9,1,-1,9,7,3,1,3,.0015971299726516008,.2632363140583038,.5896466970443726,0,2,2,8,16,8,-1,2,12,16,4,2,.0177801102399826,.587287425994873,.1760361939668655,0,2,14,6,2,6,-1,14,9,2,3,2,.0006533476989716291,.1567801982164383,.5596066117286682,0,2,1,5,6,15,-1,1,10,6,5,3,-.00028353091329336166,.1913153976202011,.5732036232948303,0,2,10,0,6,9,-1,10,3,6,3,3,.0016104689566418529,.2914913892745972,.5623080730438232,0,2,6,6,7,14,-1,6,13,7,7,2,-.0977506190538406,.194347694516182,.5648233294487,0,2,13,7,3,6,-1,13,9,3,2,3,.0005518235848285258,.3134616911411285,.5504639744758606,0,2,1,8,15,4,-1,6,8,5,4,3,-.0128582203760743,.253648191690445,.5760142803192139,0,2,11,2,3,10,-1,11,7,3,5,2,.004153023939579725,.5767722129821777,.36597740650177,0,2,3,7,4,6,-1,3,9,4,2,3,.0017092459602281451,.2843191027641296,.5918939113616943,0,2,13,3,6,10,-1,15,3,2,10,3,.007521735969930887,.4052427113056183,.6183109283447266,0,3,5,7,8,10,-1,5,7,4,5,2,9,12,4,5,2,.0022479810286313295,.578375518321991,.3135401010513306,0,3,4,4,12,12,-1,10,4,6,6,2,4,10,6,6,2,.0520062111318111,.5541312098503113,.1916636973619461,0,2,1,4,6,9,-1,3,4,2,9,3,.0120855299755931,.4032655954360962,.6644591093063354,0,2,11,3,2,5,-1,11,3,1,5,2,14687820112158079e-21,.3535977900028229,.5709382891654968,0,2,7,3,2,5,-1,8,3,1,5,2,7139518857002258e-21,.3037444949150085,.5610269904136658,0,2,10,14,2,3,-1,10,15,2,1,3,-.0046001640148460865,.7181087136268616,.4580326080322266,0,2,5,12,6,2,-1,8,12,3,2,2,.0020058949012309313,.5621951818466187,.2953684031963348,0,2,9,14,2,3,-1,9,15,2,1,3,.004505027085542679,.4615387916564941,.7619017958641052,0,2,4,11,12,6,-1,4,14,12,3,2,.0117468303069472,.5343837141990662,.1772529035806656,0,2,11,11,5,9,-1,11,14,5,3,3,-.0583163388073444,.1686245948076248,.5340772271156311,0,2,6,15,3,2,-1,6,16,3,1,2,.00023629379575140774,.3792056143283844,.6026803851127625,0,2,11,0,3,5,-1,12,0,1,5,3,-.007815618067979813,.151286706328392,.5324323773384094,0,2,5,5,6,7,-1,8,5,3,7,2,-.0108761601150036,.2081822007894516,.5319945216178894,0,2,13,0,1,9,-1,13,3,1,3,3,-.0027745519764721394,.4098246991634369,.5210328102111816,0,3,3,2,4,8,-1,3,2,2,4,2,5,6,2,4,2,-.0007827638182789087,.5693274140357971,.3478842079639435,0,2,13,12,4,6,-1,13,14,4,2,3,.0138704096898437,.5326750874519348,.2257698029279709,0,2,3,12,4,6,-1,3,14,4,2,3,-.0236749108880758,.1551305055618286,.5200707912445068,0,2,13,11,3,4,-1,13,13,3,2,2,-14879409718560055e-21,.5500566959381104,.3820176124572754,0,2,4,4,4,3,-1,4,5,4,1,3,.00361906411126256,.4238683879375458,.6639748215675354,0,2,7,5,11,8,-1,7,9,11,4,2,-.0198171101510525,.2150038033723831,.5382357835769653,0,2,7,8,3,4,-1,8,8,1,4,3,-.0038154039066284895,.6675711274147034,.4215297102928162,0,2,9,1,6,1,-1,11,1,2,1,3,-.0049775829538702965,.2267289012670517,.5386328101158142,0,2,5,5,3,3,-1,5,6,3,1,3,.002244102070108056,.4308691024780273,.6855735778808594,0,3,0,9,20,6,-1,10,9,10,3,2,0,12,10,3,2,.0122824599966407,.5836614966392517,.3467479050159454,0,2,8,6,3,5,-1,9,6,1,5,3,-.002854869933798909,.7016944885253906,.4311453998088837,0,2,11,0,1,3,-1,11,1,1,1,3,-.0037875669077038765,.2895345091819763,.5224946141242981,0,2,4,2,4,2,-1,4,3,4,1,2,-.0012201230274513364,.2975570857524872,.5481644868850708,0,2,12,6,4,3,-1,12,7,4,1,3,.010160599835217,.4888817965984345,.8182697892189026,0,2,5,0,6,4,-1,7,0,2,4,3,-.0161745697259903,.1481492966413498,.5239992737770081,0,2,9,7,3,8,-1,10,7,1,8,3,.0192924607545137,.4786309897899628,.7378190755844116,0,2,9,7,2,2,-1,10,7,1,2,2,-.003247953951358795,.7374222874641418,.4470643997192383,0,3,6,7,14,4,-1,13,7,7,2,2,6,9,7,2,2,-.009380348026752472,.3489154875278473,.5537996292114258,0,2,0,5,3,6,-1,0,7,3,2,3,-.0126061299815774,.2379686981439591,.5315443277359009,0,2,13,11,3,4,-1,13,13,3,2,2,-.0256219301372766,.1964688003063202,.5138769745826721,0,2,4,11,3,4,-1,4,13,3,2,2,-7574149640277028e-20,.5590522885322571,.3365853130817413,0,3,5,9,12,8,-1,11,9,6,4,2,5,13,6,4,2,-.0892108827829361,.0634046569466591,.516263484954834,0,2,9,12,1,3,-1,9,13,1,1,3,-.002767048077657819,.732346773147583,.4490706026554108,0,2,10,15,2,4,-1,10,17,2,2,2,.0002715257869567722,.411483496427536,.5985518097877502,24.52787971496582,51,0,2,7,7,6,1,-1,9,7,2,1,3,.001478621968999505,.266354501247406,.6643316745758057,0,3,12,3,6,6,-1,15,3,3,3,2,12,6,3,3,2,-.001874165958724916,.6143848896026611,.2518512904644013,0,2,0,4,10,6,-1,0,6,10,2,3,-.001715100952424109,.5766341090202332,.2397463023662567,0,3,8,3,8,14,-1,12,3,4,7,2,8,10,4,7,2,-.0018939269939437509,.5682045817375183,.2529144883155823,0,2,4,4,7,15,-1,4,9,7,5,3,-.005300605203956366,.1640675961971283,.5556079745292664,0,3,12,2,6,8,-1,15,2,3,4,2,12,6,3,4,2,-.0466625317931175,.6123154163360596,.4762830138206482,0,3,2,2,6,8,-1,2,2,3,4,2,5,6,3,4,2,-.000794313324149698,.5707858800888062,.2839404046535492,0,2,2,13,18,7,-1,8,13,6,7,3,.0148916700854898,.4089672863483429,.6006367206573486,0,3,4,3,8,14,-1,4,3,4,7,2,8,10,4,7,2,-.0012046529445797205,.5712450742721558,.2705289125442505,0,2,18,1,2,6,-1,18,3,2,2,3,.006061938125640154,.526250422000885,.3262225985527039,0,2,9,11,2,3,-1,9,12,2,1,3,-.0025286648888140917,.6853830814361572,.4199256896972656,0,2,18,1,2,6,-1,18,3,2,2,3,-.005901021882891655,.3266282081604004,.5434812903404236,0,2,0,1,2,6,-1,0,3,2,2,3,.005670276004821062,.5468410849571228,.2319003939628601,0,2,1,5,18,6,-1,1,7,18,2,3,-.003030410036444664,.557066798210144,.2708238065242767,0,2,0,2,6,7,-1,3,2,3,7,2,.002980364952236414,.3700568974018097,.5890625715255737,0,2,7,3,6,14,-1,7,10,6,7,2,-.0758405104279518,.2140070050954819,.5419948101043701,0,2,3,7,13,10,-1,3,12,13,5,2,.0192625392228365,.5526772141456604,.2726590037345886,0,2,11,15,2,2,-1,11,16,2,1,2,.00018888259364757687,.3958011865615845,.6017209887504578,0,3,2,11,16,4,-1,2,11,8,2,2,10,13,8,2,2,.0293695498257875,.5241373777389526,.1435758024454117,0,3,13,7,6,4,-1,16,7,3,2,2,13,9,3,2,2,.0010417619487270713,.3385409116744995,.5929983258247375,0,2,6,10,3,9,-1,6,13,3,3,3,.0026125640142709017,.5485377907752991,.3021597862243652,0,2,14,6,1,6,-1,14,9,1,3,2,.0009697746718302369,.3375276029109955,.553203284740448,0,2,5,10,4,1,-1,7,10,2,1,2,.0005951265920884907,.563174307346344,.3359399139881134,0,2,3,8,15,5,-1,8,8,5,5,3,-.1015655994415283,.0637350380420685,.5230425000190735,0,2,1,6,5,4,-1,1,8,5,2,2,.0361566990613937,.5136963129043579,.1029528975486755,0,2,3,1,17,6,-1,3,3,17,2,3,.003462414024397731,.3879320025444031,.5558289289474487,0,2,6,7,8,2,-1,10,7,4,2,2,.0195549800992012,.5250086784362793,.1875859946012497,0,2,9,7,3,2,-1,10,7,1,2,3,-.0023121440317481756,.667202889919281,.4679641127586365,0,2,8,7,3,2,-1,9,7,1,2,3,-.001860528951510787,.7163379192352295,.4334670901298523,0,2,8,9,4,2,-1,8,10,4,1,2,-.0009402636205777526,.302136093378067,.5650203227996826,0,2,8,8,4,3,-1,8,9,4,1,3,-.005241833161562681,.1820009052753449,.5250256061553955,0,2,9,5,6,4,-1,9,5,3,4,2,.00011729019752237946,.3389188051223755,.544597327709198,0,2,8,13,4,3,-1,8,14,4,1,3,.0011878840159624815,.4085349142551422,.6253563165664673,0,3,4,7,12,6,-1,10,7,6,3,2,4,10,6,3,2,-.0108813596889377,.3378399014472961,.5700082778930664,0,2,8,14,4,3,-1,8,15,4,1,3,.0017354859737679362,.4204635918140411,.6523038744926453,0,2,9,7,3,3,-1,9,8,3,1,3,-.00651190523058176,.2595216035842896,.5428143739700317,0,2,7,4,3,8,-1,8,4,1,8,3,-.0012136430013924837,.6165143847465515,.3977893888950348,0,2,10,0,3,6,-1,11,0,1,6,3,-.010354240424931,.1628028005361557,.5219504833221436,0,2,6,3,4,8,-1,8,3,2,8,2,.0005585883045569062,.3199650943279266,.5503574013710022,0,2,14,3,6,13,-1,14,3,3,13,2,.0152996499091387,.4103994071483612,.6122388243675232,0,2,8,13,3,6,-1,8,16,3,3,2,-.021588210016489,.103491298854351,.519738495349884,0,2,14,3,6,13,-1,14,3,3,13,2,-.1283462941646576,.8493865132331848,.4893102943897247,0,3,0,7,10,4,-1,0,7,5,2,2,5,9,5,2,2,-.0022927189711481333,.3130157887935638,.5471575260162354,0,2,14,3,6,13,-1,14,3,3,13,2,.0799151062965393,.4856320917606354,.6073989272117615,0,2,0,3,6,13,-1,3,3,3,13,2,-.0794410929083824,.8394674062728882,.462453305721283,0,2,9,1,4,1,-1,9,1,2,1,2,-.00528000108897686,.1881695985794067,.5306698083877563,0,2,8,0,2,1,-1,9,0,1,1,2,.0010463109938427806,.5271229147911072,.2583065927028656,0,3,10,16,4,4,-1,12,16,2,2,2,10,18,2,2,2,.00026317298761568964,.4235304892063141,.5735440850257874,0,2,9,6,2,3,-1,10,6,1,3,2,-.0036173160187900066,.6934396028518677,.4495444893836975,0,2,4,5,12,2,-1,8,5,4,2,3,.0114218797534704,.590092122554779,.4138193130493164,0,2,8,7,3,5,-1,9,7,1,5,3,-.0019963278900831938,.6466382741928101,.4327239990234375,27.153350830078125,56,0,2,6,4,8,6,-1,6,6,8,2,3,-.00996912457048893,.6142324209213257,.2482212036848068,0,2,9,5,2,12,-1,9,11,2,6,2,.0007307305932044983,.5704951882362366,.2321965992450714,0,2,4,6,6,8,-1,4,10,6,4,2,.0006404530140571296,.2112251967191696,.5814933180809021,0,2,12,2,8,5,-1,12,2,4,5,2,.004542401991784573,.2950482070446014,.586631178855896,0,2,0,8,18,3,-1,0,9,18,1,3,9247744310414419e-20,.2990990877151489,.5791326761245728,0,2,8,12,4,8,-1,8,16,4,4,2,-.008660314604640007,.2813029885292053,.5635542273521423,0,2,0,2,8,5,-1,4,2,4,5,2,.008051581680774689,.3535369038581848,.6054757237434387,0,2,13,11,3,4,-1,13,13,3,2,2,.00043835240649059415,.5596532225608826,.2731510996818543,0,2,5,11,6,1,-1,7,11,2,1,3,-981689736363478e-19,.5978031754493713,.3638561069965363,0,2,11,3,3,1,-1,12,3,1,1,3,-.0011298790341243148,.2755252122879028,.5432729125022888,0,2,7,13,5,3,-1,7,14,5,1,3,.006435615010559559,.4305641949176788,.7069833278656006,0,2,11,11,7,6,-1,11,14,7,3,2,-.0568293295800686,.2495242953300476,.5294997096061707,0,2,2,11,7,6,-1,2,14,7,3,2,.004066816996783018,.5478553175926208,.2497723996639252,0,2,12,14,2,6,-1,12,16,2,2,3,481647984997835e-19,.3938601016998291,.5706356167793274,0,2,8,14,3,3,-1,8,15,3,1,3,.00617950176820159,.440760612487793,.7394766807556152,0,2,11,0,3,5,-1,12,0,1,5,3,.006498575210571289,.5445243120193481,.2479152977466583,0,2,6,1,4,9,-1,8,1,2,9,2,-.0010211090557277203,.2544766962528229,.5338971018791199,0,2,10,3,6,1,-1,12,3,2,1,3,-.005424752831459045,.2718858122825623,.5324069261550903,0,2,8,8,3,4,-1,8,10,3,2,2,-.0010559899965301156,.3178288042545319,.553450882434845,0,2,8,12,4,2,-1,8,13,4,1,2,.0006646580877713859,.4284219145774841,.6558194160461426,0,2,5,18,4,2,-1,5,19,4,1,2,-.00027524109464138746,.5902860760688782,.3810262978076935,0,2,2,1,18,6,-1,2,3,18,2,3,.004229320213198662,.381648987531662,.5709385871887207,0,2,6,0,3,2,-1,7,0,1,2,3,-.0032868210691958666,.1747743934392929,.5259544253349304,0,3,13,8,6,2,-1,16,8,3,1,2,13,9,3,1,2,.0001561187964398414,.3601722121238709,.5725612044334412,0,2,6,10,3,6,-1,6,13,3,3,2,-7362138148891972e-21,.540185809135437,.3044497072696686,0,3,0,13,20,4,-1,10,13,10,2,2,0,15,10,2,2,-.014767250046134,.3220770061016083,.5573434829711914,0,2,7,7,6,5,-1,9,7,2,5,3,.0244895908981562,.4301528036594391,.6518812775611877,0,2,11,0,2,2,-1,11,1,2,1,2,-.000376520911231637,.356458306312561,.5598236918449402,0,3,1,8,6,2,-1,1,8,3,1,2,4,9,3,1,2,736576885174145e-20,.3490782976150513,.556189775466919,0,3,0,2,20,2,-1,10,2,10,1,2,0,3,10,1,2,-.0150999398902059,.1776272058486939,.5335299968719482,0,2,7,14,5,3,-1,7,15,5,1,3,-.0038316650316119194,.6149687767028809,.4221394062042236,0,3,7,13,6,6,-1,10,13,3,3,2,7,16,3,3,2,.0169254001230001,.5413014888763428,.2166585028171539,0,2,9,12,2,3,-1,9,13,2,1,3,-.003047785023227334,.6449490785598755,.4354617893695831,0,2,16,11,1,6,-1,16,13,1,2,3,.003214058931916952,.5400155186653137,.3523217141628265,0,2,3,11,1,6,-1,3,13,1,2,3,-.004002320114523172,.2774524092674255,.5338417291641235,0,3,4,4,14,12,-1,11,4,7,6,2,4,10,7,6,2,.0074182129465043545,.567673921585083,.3702817857265472,0,2,5,4,3,3,-1,5,5,3,1,3,-.008876458741724491,.7749221920967102,.4583688974380493,0,2,12,3,3,3,-1,13,3,1,3,3,.002731173997744918,.5338721871376038,.3996661007404327,0,2,6,6,8,3,-1,6,7,8,1,3,-.0025082379579544067,.5611963272094727,.377749890089035,0,2,12,3,3,3,-1,13,3,1,3,3,-.008054107427597046,.291522890329361,.5179182887077332,0,3,3,1,4,10,-1,3,1,2,5,2,5,6,2,5,2,-.0009793881326913834,.5536432862281799,.3700192868709564,0,2,5,7,10,2,-1,5,7,5,2,2,-.005874590948224068,.3754391074180603,.5679376125335693,0,2,8,7,3,3,-1,9,7,1,3,3,-.00449367193505168,.7019699215888977,.4480949938297272,0,2,15,12,2,3,-1,15,13,2,1,3,-.00543892290443182,.2310364991426468,.5313386917114258,0,2,7,8,3,4,-1,8,8,1,4,3,-.0007509464048780501,.5864868760108948,.4129343032836914,0,2,13,4,1,12,-1,13,10,1,6,2,14528800420521293e-21,.3732407093048096,.5619621276855469,0,3,4,5,12,12,-1,4,5,6,6,2,10,11,6,6,2,.0407580696046352,.5312091112136841,.2720521986484528,0,2,7,14,7,3,-1,7,15,7,1,3,.006650593131780624,.4710015952587128,.6693493723869324,0,2,3,12,2,3,-1,3,13,2,1,3,.0045759351924061775,.5167819261550903,.1637275964021683,0,3,3,2,14,2,-1,10,2,7,1,2,3,3,7,1,2,.0065269311890006065,.5397608876228333,.2938531935214996,0,2,0,1,3,10,-1,1,1,1,10,3,-.0136603796854615,.7086488008499146,.453220009803772,0,2,9,0,6,5,-1,11,0,2,5,3,.0273588690906763,.5206481218338013,.3589231967926025,0,2,5,7,6,2,-1,8,7,3,2,2,.0006219755159690976,.3507075905799866,.5441123247146606,0,2,7,1,6,10,-1,7,6,6,5,2,-.0033077080734074116,.5859522819519043,.402489185333252,0,2,1,1,18,3,-1,7,1,6,3,3,-.0106311095878482,.6743267178535461,.4422602951526642,0,2,16,3,3,6,-1,16,5,3,2,3,.0194416493177414,.5282716155052185,.1797904968261719,34.55411148071289,71,0,2,6,3,7,6,-1,6,6,7,3,2,-.005505216773599386,.5914731025695801,.2626559138298035,0,2,4,7,12,2,-1,8,7,4,2,3,.001956227933987975,.2312581986188889,.5741627216339111,0,2,0,4,17,10,-1,0,9,17,5,2,-.008892478421330452,.1656530052423477,.5626654028892517,0,2,3,4,15,16,-1,3,12,15,8,2,.0836383774876595,.5423449873924255,.1957294940948486,0,2,7,15,6,4,-1,7,17,6,2,2,.0012282270472496748,.3417904078960419,.5992503762245178,0,2,15,2,4,9,-1,15,2,2,9,2,.0057629169896245,.3719581961631775,.6079903841018677,0,2,2,3,3,2,-1,2,4,3,1,2,-.0016417410224676132,.2577486038208008,.5576915740966797,0,2,13,6,7,9,-1,13,9,7,3,3,.0034113149158656597,.2950749099254608,.5514171719551086,0,2,8,11,4,3,-1,8,12,4,1,3,-.0110693201422691,.7569358944892883,.4477078914642334,0,3,0,2,20,6,-1,10,2,10,3,2,0,5,10,3,2,.0348659716546535,.5583708882331848,.2669621109962463,0,3,3,2,6,10,-1,3,2,3,5,2,6,7,3,5,2,.0006570109981112182,.5627313256263733,.2988890111446381,0,2,13,10,3,4,-1,13,12,3,2,2,-.0243391301482916,.2771185040473938,.5108863115310669,0,2,4,10,3,4,-1,4,12,3,2,2,.0005943520227447152,.5580651760101318,.3120341897010803,0,2,7,5,6,3,-1,9,5,2,3,3,.0022971509024500847,.3330250084400177,.5679075717926025,0,2,7,6,6,8,-1,7,10,6,4,2,-.0037801829166710377,.2990534901618958,.5344808101654053,0,2,0,11,20,6,-1,0,14,20,3,2,-.13420669734478,.1463858932256699,.5392568111419678,0,3,4,13,4,6,-1,4,13,2,3,2,6,16,2,3,2,.0007522454834543169,.3746953904628754,.5692734718322754,0,3,6,0,8,12,-1,10,0,4,6,2,6,6,4,6,2,-.040545541793108,.2754747867584229,.5484297871589661,0,2,2,0,15,2,-1,2,1,15,1,2,.0012572970008477569,.3744584023952484,.5756075978279114,0,2,9,12,2,3,-1,9,13,2,1,3,-.007424994837492704,.7513859272003174,.4728231132030487,0,2,3,12,1,2,-1,3,13,1,1,2,.0005090812919661403,.540489673614502,.2932321131229401,0,2,9,11,2,3,-1,9,12,2,1,3,-.001280845026485622,.6169779896736145,.4273349046707153,0,2,7,3,3,1,-1,8,3,1,1,3,-.0018348860321566463,.2048496007919312,.5206472277641296,0,2,17,7,3,6,-1,17,9,3,2,3,.0274848695844412,.5252984762191772,.1675522029399872,0,2,7,2,3,2,-1,8,2,1,2,3,.0022372419480234385,.5267782807350159,.2777658104896545,0,2,11,4,5,3,-1,11,5,5,1,3,-.008863529190421104,.69545578956604,.4812048971652985,0,2,4,4,5,3,-1,4,5,5,1,3,.004175397101789713,.4291887879371643,.6349195837974548,0,2,19,3,1,2,-1,19,4,1,1,2,-.0017098189564421773,.2930536866188049,.5361248850822449,0,2,5,5,4,3,-1,5,6,4,1,3,.006532854866236448,.4495325088500977,.7409694194793701,0,2,17,7,3,6,-1,17,9,3,2,3,-.009537290781736374,.3149119913578033,.5416501760482788,0,2,0,7,3,6,-1,0,9,3,2,3,.0253109894692898,.5121892094612122,.1311707943677902,0,2,14,2,6,9,-1,14,5,6,3,3,.0364609695971012,.5175911784172058,.2591339945793152,0,2,0,4,5,6,-1,0,6,5,2,3,.0208543296903372,.5137140154838562,.1582316011190414,0,2,10,5,6,2,-1,12,5,2,2,3,-.0008720774785615504,.5574309825897217,.439897894859314,0,2,4,5,6,2,-1,6,5,2,2,3,-15227000403683633e-21,.5548940896987915,.3708069920539856,0,2,8,1,4,6,-1,8,3,4,2,3,-.0008431650931015611,.3387419879436493,.5554211139678955,0,2,0,2,3,6,-1,0,4,3,2,3,.0036037859972566366,.5358061790466309,.3411171138286591,0,2,6,6,8,3,-1,6,7,8,1,3,-.006805789191275835,.6125202775001526,.4345862865447998,0,2,0,1,5,9,-1,0,4,5,3,3,-.0470216609537601,.2358165979385376,.519373893737793,0,2,16,0,4,15,-1,16,0,2,15,2,-.0369541086256504,.7323111295700073,.4760943949222565,0,2,1,10,3,2,-1,1,11,3,1,2,.0010439479956403375,.5419455170631409,.3411330878734589,0,2,14,4,1,10,-1,14,9,1,5,2,-.00021050689974799752,.2821694016456604,.5554947257041931,0,2,0,1,4,12,-1,2,1,2,12,2,-.0808315873146057,.9129930138587952,.4697434902191162,0,2,11,11,4,2,-1,11,11,2,2,2,-.0003657905908767134,.6022670269012451,.3978292942047119,0,2,5,11,4,2,-1,7,11,2,2,2,-.00012545920617412776,.5613213181495667,.384553998708725,0,2,3,8,15,5,-1,8,8,5,5,3,-.0687864869832993,.2261611968278885,.5300496816635132,0,2,0,0,6,10,-1,3,0,3,10,2,.0124157899990678,.4075691998004913,.5828812122344971,0,2,11,4,3,2,-1,12,4,1,2,3,-.004717481788247824,.2827253937721252,.5267757773399353,0,2,8,12,3,8,-1,8,16,3,4,2,.0381368584930897,.5074741244316101,.1023615971207619,0,2,8,14,5,3,-1,8,15,5,1,3,-.0028168049175292253,.6169006824493408,.4359692931175232,0,2,7,14,4,3,-1,7,15,4,1,3,.008130360394716263,.4524433016777039,.76060950756073,0,2,11,4,3,2,-1,12,4,1,2,3,.006005601957440376,.5240408778190613,.185971200466156,0,3,3,15,14,4,-1,3,15,7,2,2,10,17,7,2,2,.0191393196582794,.5209379196166992,.2332071959972382,0,3,2,2,16,4,-1,10,2,8,2,2,2,4,8,2,2,.0164457596838474,.5450702905654907,.3264234960079193,0,2,0,8,6,12,-1,3,8,3,12,2,-.0373568907380104,.6999046802520752,.4533241987228394,0,2,5,7,10,2,-1,5,7,5,2,2,-.0197279006242752,.2653664946556091,.54128098487854,0,2,9,7,2,5,-1,10,7,1,5,2,.0066972579807043076,.4480566084384918,.7138652205467224,0,3,13,7,6,4,-1,16,7,3,2,2,13,9,3,2,2,.0007445752853527665,.4231350123882294,.5471320152282715,0,2,0,13,8,2,-1,0,14,8,1,2,.0011790640419349074,.5341702103614807,.3130455017089844,0,3,13,7,6,4,-1,16,7,3,2,2,13,9,3,2,2,.0349806100130081,.5118659734725952,.343053013086319,0,3,1,7,6,4,-1,1,7,3,2,2,4,9,3,2,2,.0005685979267582297,.3532187044620514,.5468639731407166,0,2,12,6,1,12,-1,12,12,1,6,2,-.0113406497985125,.2842353880405426,.5348700881004333,0,2,9,5,2,6,-1,10,5,1,6,2,-.00662281084805727,.6883640289306641,.4492664933204651,0,2,14,12,2,3,-1,14,13,2,1,3,-.008016033098101616,.1709893941879273,.5224308967590332,0,2,4,12,2,3,-1,4,13,2,1,3,.0014206819469109178,.5290846228599548,.299338310956955,0,2,8,12,4,3,-1,8,13,4,1,3,-.002780171111226082,.6498854160308838,.4460499882698059,0,3,5,2,2,4,-1,5,2,1,2,2,6,4,1,2,2,-.0014747589593753219,.3260438144207001,.5388113260269165,0,2,5,5,11,3,-1,5,6,11,1,3,-.0238303393125534,.7528941035270691,.4801219999790192,0,2,7,6,4,12,-1,7,12,4,6,2,.00693697901442647,.5335165858268738,.3261427879333496,0,2,12,13,8,5,-1,12,13,4,5,2,.008280625566840172,.458039402961731,.5737829804420471,0,2,7,6,1,12,-1,7,12,1,6,2,-.0104395002126694,.2592320144176483,.5233827829360962,39.1072883605957,80,0,2,1,2,6,3,-1,4,2,3,3,2,.0072006587870419025,.325888603925705,.6849808096885681,0,3,9,5,6,10,-1,12,5,3,5,2,9,10,3,5,2,-.002859358908608556,.5838881134986877,.2537829875946045,0,3,5,5,8,12,-1,5,5,4,6,2,9,11,4,6,2,.0006858052802272141,.5708081722259521,.2812424004077911,0,2,0,7,20,6,-1,0,9,20,2,3,.007958019152283669,.2501051127910614,.5544260740280151,0,2,4,2,2,2,-1,4,3,2,1,2,-.0012124150525778532,.2385368049144745,.5433350205421448,0,2,4,18,12,2,-1,8,18,4,2,3,.00794261321425438,.3955070972442627,.6220757961273193,0,2,7,4,4,16,-1,7,12,4,8,2,.0024630590341985226,.5639708042144775,.2992357909679413,0,2,7,6,7,8,-1,7,10,7,4,2,-.006039659958332777,.218651294708252,.541167676448822,0,2,6,3,3,1,-1,7,3,1,1,3,-.0012988339876756072,.23507060110569,.5364584922790527,0,2,11,15,2,4,-1,11,17,2,2,2,.00022299369447864592,.380411297082901,.572960615158081,0,2,3,5,4,8,-1,3,9,4,4,2,.0014654280385002494,.2510167956352234,.5258268713951111,0,2,7,1,6,12,-1,7,7,6,6,2,-.0008121004211716354,.5992823839187622,.3851158916950226,0,2,4,6,6,2,-1,6,6,2,2,3,-.0013836020370945334,.5681396126747131,.3636586964130402,0,2,16,4,4,6,-1,16,6,4,2,3,-.0279364492744207,.1491317003965378,.5377560257911682,0,2,3,3,5,2,-1,3,4,5,1,2,-.0004691955109592527,.3692429959774017,.5572484731674194,0,2,9,11,2,3,-1,9,12,2,1,3,-.004982965998351574,.6758509278297424,.4532504081726074,0,2,2,16,4,2,-1,2,17,4,1,2,.001881530974060297,.5368022918701172,.2932539880275726,0,3,7,13,6,6,-1,10,13,3,3,2,7,16,3,3,2,-.0190675500780344,.1649377048015595,.5330067276954651,0,2,7,0,3,4,-1,8,0,1,4,3,-.0046906559728085995,.1963925957679749,.5119361877441406,0,2,8,15,4,3,-1,8,16,4,1,3,.005977713968604803,.467117190361023,.7008398175239563,0,2,0,4,4,6,-1,0,6,4,2,3,-.0333031304180622,.1155416965484619,.5104162096977234,0,2,5,6,12,3,-1,9,6,4,3,3,.0907441079616547,.5149660110473633,.1306173056364059,0,2,7,6,6,14,-1,9,6,2,14,3,.0009355589863844216,.3605481088161469,.543985903263092,0,2,9,7,3,3,-1,10,7,1,3,3,.0149016501381993,.4886212050914764,.7687569856643677,0,2,6,12,2,4,-1,6,14,2,2,2,.0006159411859698594,.5356813073158264,.3240939080715179,0,2,10,12,7,6,-1,10,14,7,2,3,-.0506709888577461,.1848621964454651,.5230404138565063,0,2,1,0,15,2,-1,1,1,15,1,2,.0006866574985906482,.3840579986572266,.5517945885658264,0,2,14,0,6,6,-1,14,0,3,6,2,.008371243253350258,.4288564026355743,.6131753921508789,0,2,5,3,3,1,-1,6,3,1,1,3,-.0012953069526702166,.2913674116134644,.528073787689209,0,2,14,0,6,6,-1,14,0,3,6,2,-.0419416800141335,.7554799914360046,.4856030941009522,0,2,0,3,20,10,-1,0,8,20,5,2,-.0235293805599213,.2838279902935028,.5256081223487854,0,2,14,0,6,6,-1,14,0,3,6,2,.0408574491739273,.4870935082435608,.6277297139167786,0,2,0,0,6,6,-1,3,0,3,6,2,-.0254068691283464,.7099707722663879,.4575029015541077,0,2,19,15,1,2,-1,19,16,1,1,2,-.00041415440500713885,.4030886888504028,.5469412207603455,0,2,0,2,4,8,-1,2,2,2,8,2,.0218241196125746,.4502024054527283,.6768701076507568,0,3,2,1,18,4,-1,11,1,9,2,2,2,3,9,2,2,.0141140399500728,.5442860722541809,.3791700005531311,0,2,8,12,1,2,-1,8,13,1,1,2,6721459067193791e-20,.4200463891029358,.5873476266860962,0,3,5,2,10,6,-1,10,2,5,3,2,5,5,5,3,2,-.00794176384806633,.3792561888694763,.5585265755653381,0,2,9,7,2,4,-1,10,7,1,4,2,-.00721444096416235,.7253103852272034,.4603548943996429,0,2,9,7,3,3,-1,10,7,1,3,3,.002581733977422118,.4693301916122437,.5900238752365112,0,2,4,5,12,8,-1,8,5,4,8,3,.1340931951999664,.5149213075637817,.1808844953775406,0,2,15,15,4,3,-1,15,16,4,1,3,.0022962710354477167,.5399743914604187,.3717867136001587,0,2,8,18,3,1,-1,9,18,1,1,3,-.002157584996894002,.2408495992422104,.5148863792419434,0,2,9,13,4,3,-1,9,14,4,1,3,-.004919618833810091,.6573588252067566,.4738740026950836,0,2,7,13,4,3,-1,7,14,4,1,3,.0016267469618469477,.4192821979522705,.6303114295005798,0,2,19,15,1,2,-1,19,16,1,1,2,.00033413388882763684,.5540298223495483,.3702101111412048,0,2,0,15,8,4,-1,0,17,8,2,2,-.0266980808228254,.1710917949676514,.5101410746574402,0,2,9,3,6,4,-1,11,3,2,4,3,-.0305618792772293,.1904218047857285,.5168793797492981,0,2,8,14,4,3,-1,8,15,4,1,3,.002851154888048768,.4447506964206696,.6313853859901428,0,2,3,14,14,6,-1,3,16,14,2,3,-.0362114794552326,.2490727007389069,.5377349257469177,0,2,6,3,6,6,-1,6,6,6,3,2,-.002411518944427371,.5381243228912354,.3664236962795258,0,2,5,11,10,6,-1,5,14,10,3,2,-.0007725320174358785,.5530232191085815,.3541550040245056,0,2,3,10,3,4,-1,4,10,1,4,3,.0002948172914329916,.4132699072360992,.5667243003845215,0,2,13,9,2,2,-1,13,9,1,2,2,-.006233456078916788,.0987872332334518,.5198668837547302,0,2,5,3,6,4,-1,7,3,2,4,3,-.0262747295200825,.0911274924874306,.5028107166290283,0,2,9,7,3,3,-1,10,7,1,3,3,.005321226082742214,.4726648926734924,.6222720742225647,0,2,2,12,2,3,-1,2,13,2,1,3,-.004112905822694302,.2157457023859024,.5137804746627808,0,2,9,8,3,12,-1,9,12,3,4,3,.0032457809429615736,.5410770773887634,.3721776902675629,0,3,3,14,4,6,-1,3,14,2,3,2,5,17,2,3,2,-.0163597092032433,.7787874937057495,.4685291945934296,0,2,16,15,2,2,-1,16,16,2,1,2,.00032166109303943813,.5478987097740173,.4240373969078064,0,2,2,15,2,2,-1,2,16,2,1,2,.000644524407107383,.5330560803413391,.3501324951648712,0,2,8,12,4,3,-1,8,13,4,1,3,-.0078909732401371,.6923521161079407,.4726569056510925,0,2,0,7,20,1,-1,10,7,10,1,2,.048336211591959,.50559002161026,.0757492035627365,0,2,7,6,8,3,-1,7,6,4,3,2,-.000751781277358532,.3783741891384125,.5538573861122131,0,2,5,7,8,2,-1,9,7,4,2,2,-.002495391061529517,.3081651031970978,.5359612107276917,0,2,9,7,3,5,-1,10,7,1,5,3,-.0022385010961443186,.663395881652832,.4649342894554138,0,2,8,7,3,5,-1,9,7,1,5,3,-.0017988430336117744,.6596844792366028,.4347187876701355,0,2,11,1,3,5,-1,12,1,1,5,3,.008786091580986977,.523183286190033,.2315579950809479,0,2,6,2,3,6,-1,7,2,1,6,3,.003671538084745407,.520425021648407,.2977376878261566,0,2,14,14,6,5,-1,14,14,3,5,2,-.0353364497423172,.7238878011703491,.4861505031585693,0,2,9,8,2,2,-1,9,9,2,1,2,-.0006918924045749009,.3105022013187408,.5229824781417847,0,2,10,7,1,3,-1,10,8,1,1,3,-.003394610946998,.3138968050479889,.5210173726081848,0,3,6,6,2,2,-1,6,6,1,1,2,7,7,1,1,2,.0009856928372755647,.4536580145359039,.6585097908973694,0,3,2,11,18,4,-1,11,11,9,2,2,2,13,9,2,2,-.0501631014049053,.1804454028606415,.5198916792869568,0,3,6,6,2,2,-1,6,6,1,1,2,7,7,1,1,2,-.0022367259953171015,.7255702018737793,.4651359021663666,0,2,0,15,20,2,-1,0,16,20,1,2,.0007432628772221506,.4412921071052551,.5898545980453491,0,2,4,14,2,3,-1,4,15,2,1,3,-.0009348518215119839,.3500052988529205,.5366017818450928,0,2,8,14,4,3,-1,8,15,4,1,3,.0174979399889708,.4912194907665253,.8315284848213196,0,2,8,7,2,3,-1,8,8,2,1,3,-.0015200000489130616,.3570275902748108,.537056028842926,0,2,9,10,2,3,-1,9,11,2,1,3,.0007800394087098539,.4353772103786469,.5967335104942322,50.61048126220703,103,0,2,5,4,10,4,-1,5,6,10,2,2,-.00999455526471138,.6162583231925964,.3054533004760742,0,3,9,7,6,4,-1,12,7,3,2,2,9,9,3,2,2,-.001108522992581129,.5818294882774353,.3155578076839447,0,2,4,7,3,6,-1,4,9,3,2,3,.001036438043229282,.2552052140235901,.5692911744117737,0,3,11,15,4,4,-1,13,15,2,2,2,11,17,2,2,2,.000682113110087812,.3685089945793152,.5934931039810181,0,2,7,8,4,2,-1,7,9,4,1,2,-.0006805734010413289,.2332392036914825,.5474792122840881,0,2,13,1,4,3,-1,13,1,2,3,2,.0002606878988444805,.325745701789856,.5667545795440674,0,3,5,15,4,4,-1,5,15,2,2,2,7,17,2,2,2,.0005160737200640142,.3744716942310333,.5845472812652588,0,2,9,5,4,7,-1,9,5,2,7,2,.0008500752155669034,.3420371115207672,.5522807240486145,0,2,5,6,8,3,-1,9,6,4,3,2,-.0018607829697430134,.2804419994354248,.5375424027442932,0,2,9,9,2,2,-1,9,10,2,1,2,-.001503397012129426,.2579050958156586,.5498952269554138,0,2,7,15,5,3,-1,7,16,5,1,3,.0023478909861296415,.4175156056880951,.6313710808753967,0,2,11,10,4,3,-1,11,10,2,3,2,-.00028880240279249847,.5865169763565063,.4052666127681732,0,2,6,9,8,10,-1,6,14,8,5,2,.008940547704696655,.5211141109466553,.231865406036377,0,2,10,11,6,2,-1,10,11,3,2,2,-.0193277392536402,.2753432989120483,.5241525769233704,0,2,4,11,6,2,-1,7,11,3,2,2,-.0002020206011366099,.5722978711128235,.3677195906639099,0,2,11,3,8,1,-1,11,3,4,1,2,.002117906929925084,.4466108083724976,.5542430877685547,0,2,6,3,3,2,-1,7,3,1,2,3,-.0017743760254234076,.2813253104686737,.5300959944725037,0,2,14,5,6,5,-1,14,5,3,5,2,.004223445896059275,.439970999956131,.5795428156852722,0,2,7,5,2,12,-1,7,11,2,6,2,-.0143752200528979,.2981117963790894,.5292059183120728,0,2,8,11,4,3,-1,8,12,4,1,3,-.0153491804376245,.7705215215682983,.4748171865940094,0,2,4,1,2,3,-1,5,1,1,3,2,15152279956964776e-21,.3718844056129456,.5576897263526917,0,2,18,3,2,6,-1,18,5,2,2,3,-.009129391983151436,.3615196049213409,.5286766886711121,0,2,0,3,2,6,-1,0,5,2,2,3,.0022512159775942564,.5364704728126526,.3486298024654388,0,2,9,12,2,3,-1,9,13,2,1,3,-.0049696918576955795,.6927651762962341,.4676836133003235,0,2,7,13,4,3,-1,7,14,4,1,3,-.0128290103748441,.7712153792381287,.4660735130310059,0,2,18,0,2,6,-1,18,2,2,2,3,-.009366006590425968,.3374983966350555,.5351287722587585,0,2,0,0,2,6,-1,0,2,2,2,3,.0032452319283038378,.5325189828872681,.3289610147476196,0,2,8,14,6,3,-1,8,15,6,1,3,-.0117235602810979,.6837652921676636,.4754300117492676,0,2,7,4,2,4,-1,8,4,1,4,2,2925794069597032e-20,.357208788394928,.5360502004623413,0,2,8,5,4,6,-1,8,7,4,2,3,-22244219508138485e-21,.5541427135467529,.3552064001560211,0,2,6,4,2,2,-1,7,4,1,2,2,.005088150966912508,.5070844292640686,.1256462037563324,0,3,3,14,14,4,-1,10,14,7,2,2,3,16,7,2,2,.0274296794086695,.5269560217857361,.1625818014144898,0,3,6,15,6,2,-1,6,15,3,1,2,9,16,3,1,2,-.00641428679227829,.7145588994026184,.4584197103977203,0,2,14,15,6,2,-1,14,16,6,1,2,.003347995923832059,.5398612022399902,.3494696915149689,0,2,2,12,12,8,-1,2,16,12,4,2,-.0826354920864105,.2439192980527878,.5160226225852966,0,2,7,7,7,2,-1,7,8,7,1,2,.0010261740535497665,.3886891901493073,.5767908096313477,0,2,0,2,18,2,-1,0,3,18,1,2,-.0016307090409100056,.3389458060264587,.5347700715065002,0,2,9,6,2,5,-1,9,6,1,5,2,.0024546680506318808,.4601413905620575,.638724684715271,0,2,7,5,3,8,-1,8,5,1,8,3,-.0009947651997208595,.5769879221916199,.4120396077632904,0,2,9,6,3,4,-1,10,6,1,4,3,.0154091902077198,.4878709018230438,.7089822292327881,0,2,4,13,3,2,-1,4,14,3,1,2,.001178440055809915,.5263553261756897,.2895244956016541,0,2,9,4,6,3,-1,11,4,2,3,3,-.0277019198983908,.149882897734642,.5219606757164001,0,2,5,4,6,3,-1,7,4,2,3,3,-.0295053999871016,.024893319234252,.4999816119670868,0,2,14,11,5,2,-1,14,12,5,1,2,.0004515943001024425,.5464622974395752,.4029662907123566,0,2,1,2,6,9,-1,3,2,2,9,3,.007177263963967562,.4271056950092316,.5866296887397766,0,2,14,6,6,13,-1,14,6,3,13,2,-.0741820484399796,.6874179244041443,.4919027984142304,0,3,3,6,14,8,-1,3,6,7,4,2,10,10,7,4,2,-.0172541607171297,.3370676040649414,.534873902797699,0,2,16,0,4,11,-1,16,0,2,11,2,.0148515598848462,.4626792967319489,.6129904985427856,0,3,3,4,12,12,-1,3,4,6,6,2,9,10,6,6,2,.0100020002573729,.5346122980117798,.3423453867435455,0,2,11,4,5,3,-1,11,5,5,1,3,.0020138120744377375,.4643830060958862,.5824304223060608,0,2,4,11,4,2,-1,4,12,4,1,2,.0015135470312088728,.5196396112442017,.2856149971485138,0,2,10,7,2,2,-1,10,7,1,2,2,.003138143103569746,.4838162958621979,.5958529710769653,0,2,8,7,2,2,-1,9,7,1,2,2,-.005145044066011906,.8920302987098694,.4741412103176117,0,2,9,17,3,2,-1,10,17,1,2,3,-.004473670851439238,.2033942937850952,.5337278842926025,0,2,5,6,3,3,-1,5,7,3,1,3,.001962847076356411,.457163393497467,.6725863218307495,0,2,10,0,3,3,-1,11,0,1,3,3,.005426045041531324,.5271108150482178,.2845670878887177,0,3,5,6,6,2,-1,5,6,3,1,2,8,7,3,1,2,.0004961146041750908,.4138312935829163,.5718597769737244,0,2,12,16,4,3,-1,12,17,4,1,3,.009372878819704056,.5225151181221008,.2804847061634064,0,2,3,12,3,2,-1,3,13,3,1,2,.0006050089723430574,.523676872253418,.3314523994922638,0,2,9,12,3,2,-1,9,13,3,1,2,.0005679255118593574,.4531059861183167,.6276971101760864,0,3,1,11,16,4,-1,1,11,8,2,2,9,13,8,2,2,.0246443394571543,.5130851864814758,.2017143964767456,0,2,12,4,3,3,-1,12,5,3,1,3,-.0102904504165053,.7786595225334167,.4876641035079956,0,2,4,4,5,3,-1,4,5,5,1,3,.002062941901385784,.4288598895072937,.5881264209747314,0,2,12,16,4,3,-1,12,17,4,1,3,-.005051948130130768,.3523977994918823,.5286008715629578,0,2,5,4,3,3,-1,5,5,3,1,3,-.0057692620903253555,.6841086149215698,.4588094055652618,0,2,9,0,2,2,-1,9,1,2,1,2,-.0004578994121402502,.356552004814148,.5485978126525879,0,2,8,9,4,2,-1,8,10,4,1,2,-.0007591883768327534,.336879312992096,.5254197120666504,0,2,8,8,4,3,-1,8,9,4,1,3,-.001773725962266326,.3422161042690277,.5454015135765076,0,2,0,13,6,3,-1,2,13,2,3,3,-.008561046794056892,.6533612012863159,.4485856890678406,0,2,16,14,3,2,-1,16,15,3,1,2,.0017277270089834929,.5307580232620239,.3925352990627289,0,2,1,18,18,2,-1,7,18,6,2,3,-.0281996093690395,.685745894908905,.4588584005832672,0,2,16,14,3,2,-1,16,15,3,1,2,-.001778110978193581,.4037851095199585,.5369856953620911,0,2,1,14,3,2,-1,1,15,3,1,2,.00033177141449414194,.539979875087738,.3705750107765198,0,2,7,14,6,3,-1,7,15,6,1,3,.0026385399978607893,.4665437042713165,.6452730894088745,0,2,5,14,8,3,-1,5,15,8,1,3,-.0021183069329708815,.5914781093597412,.4064677059650421,0,2,10,6,4,14,-1,10,6,2,14,2,-.0147732896730304,.3642038106918335,.5294762849807739,0,2,6,6,4,14,-1,8,6,2,14,2,-.0168154407292604,.2664231956005096,.5144972801208496,0,2,13,5,2,3,-1,13,6,2,1,3,-.006337014026939869,.6779531240463257,.4852097928524017,0,2,7,16,6,1,-1,9,16,2,1,3,-44560048991115764e-21,.5613964796066284,.4153054058551788,0,2,9,12,3,3,-1,9,13,3,1,3,-.0010240620467811823,.5964478254318237,.4566304087638855,0,2,7,0,3,3,-1,8,0,1,3,3,-.00231616897508502,.2976115047931671,.5188159942626953,0,2,4,0,16,18,-1,4,9,16,9,2,.5321757197380066,.5187839269638062,.220263198018074,0,2,1,1,16,14,-1,1,8,16,7,2,-.1664305031299591,.1866022944450378,.5060343146324158,0,2,3,9,15,4,-1,8,9,5,4,3,.112535297870636,.5212125182151794,.1185022965073586,0,2,6,12,7,3,-1,6,13,7,1,3,.009304686449468136,.4589937031269074,.6826149225234985,0,2,14,15,2,3,-1,14,16,2,1,3,-.004625509958714247,.3079940974712372,.5225008726119995,0,3,2,3,16,14,-1,2,3,8,7,2,10,10,8,7,2,-.1111646965146065,.2101044058799744,.5080801844596863,0,3,16,2,4,18,-1,18,2,2,9,2,16,11,2,9,2,-.0108884396031499,.5765355229377747,.4790464043617249,0,2,4,15,2,3,-1,4,16,2,1,3,.005856430158019066,.5065100193023682,.1563598960638046,0,3,16,2,4,18,-1,18,2,2,9,2,16,11,2,9,2,.0548543892800808,.49669149518013,.7230510711669922,0,2,1,1,8,3,-1,1,2,8,1,3,-.0111973397433758,.2194979041814804,.5098798274993896,0,2,8,11,4,3,-1,8,12,4,1,3,.004406907130032778,.4778401851654053,.6770902872085571,0,2,5,11,5,9,-1,5,14,5,3,3,-.0636652931571007,.1936362981796265,.5081024169921875,0,2,16,0,4,11,-1,16,0,2,11,2,-.009808149188756943,.599906325340271,.4810341000556946,0,2,7,0,6,1,-1,9,0,2,1,3,-.0021717099007219076,.3338333964347839,.5235472917556763,0,2,16,3,3,7,-1,17,3,1,7,3,-.0133155202493072,.6617069840431213,.4919213056564331,0,2,1,3,3,7,-1,2,3,1,7,3,.002544207964092493,.4488744139671326,.6082184910774231,0,2,7,8,6,12,-1,7,12,6,4,3,.0120378397405148,.540939211845398,.3292432129383087,0,2,0,0,4,11,-1,2,0,2,11,2,-.0207010507583618,.6819120049476624,.4594995975494385,0,2,14,0,6,20,-1,14,0,3,20,2,.0276082791388035,.4630792140960693,.5767282843589783,0,2,0,3,1,2,-1,0,4,1,1,2,.0012370620388537645,.5165379047393799,.2635016143321991,0,3,5,5,10,8,-1,10,5,5,4,2,5,9,5,4,2,-.037669338285923,.2536393105983734,.5278980135917664,0,3,4,7,12,4,-1,4,7,6,2,2,10,9,6,2,2,-.0018057259730994701,.3985156118869782,.5517500042915344,54.62007141113281,111,0,2,2,1,6,4,-1,5,1,3,4,2,.004429902881383896,.2891018092632294,.633522629737854,0,3,9,7,6,4,-1,12,7,3,2,2,9,9,3,2,2,-.0023813319858163595,.621178925037384,.3477487862110138,0,2,5,6,2,6,-1,5,9,2,3,2,.0022915711160749197,.2254412025213242,.5582118034362793,0,3,9,16,6,4,-1,12,16,3,2,2,9,18,3,2,2,.0009945794008672237,.3711710870265961,.5930070877075195,0,2,9,4,2,12,-1,9,10,2,6,2,.0007716466789133847,.565172016620636,.334799587726593,0,2,7,1,6,18,-1,9,1,2,18,3,-.001138641033321619,.3069126009941101,.5508630871772766,0,2,4,12,12,2,-1,8,12,4,2,3,-.0001640303962631151,.576282799243927,.3699047863483429,0,2,8,8,6,2,-1,8,9,6,1,2,29793529392918572e-21,.2644244134426117,.5437911152839661,0,2,8,0,3,6,-1,9,0,1,6,3,.008577490225434303,.5051138997077942,.1795724928379059,0,2,11,18,3,2,-1,11,19,3,1,2,-.0002603268949314952,.5826969146728516,.4446826875209808,0,2,1,1,17,4,-1,1,3,17,2,2,-.006140463054180145,.3113852143287659,.5346971750259399,0,2,11,8,4,12,-1,11,8,2,12,2,-.0230869501829147,.32779461145401,.533119797706604,0,2,8,14,4,3,-1,8,15,4,1,3,-.0142436502501369,.7381709814071655,.4588063061237335,0,2,12,3,2,17,-1,12,3,1,17,2,.0194871295243502,.5256630778312683,.2274471968412399,0,2,4,7,6,1,-1,6,7,2,1,3,-.0009668110869824886,.5511230826377869,.3815006911754608,0,2,18,3,2,3,-1,18,4,2,1,3,.003147470997646451,.5425636768341064,.2543726861476898,0,2,8,4,3,4,-1,8,6,3,2,2,-.00018026070029009134,.5380191802978516,.3406304121017456,0,2,4,5,12,10,-1,4,10,12,5,2,-.006026626098901033,.3035801947116852,.54205721616745,0,2,5,18,4,2,-1,7,18,2,2,2,.00044462960795499384,.3990997076034546,.5660110116004944,0,2,17,2,3,6,-1,17,4,3,2,3,.002260976005345583,.5562806725502014,.3940688073635101,0,2,7,7,6,6,-1,9,7,2,6,3,.0511330589652061,.4609653949737549,.7118561863899231,0,2,17,2,3,6,-1,17,4,3,2,3,-.0177863091230392,.2316166013479233,.5322144031524658,0,2,8,0,3,4,-1,9,0,1,4,3,-.004967962857335806,.233077198266983,.5122029185295105,0,2,9,14,2,3,-1,9,15,2,1,3,.002066768938675523,.4657444059848785,.6455488204956055,0,2,0,12,6,3,-1,0,13,6,1,3,.007441376801580191,.5154392123222351,.236163392663002,0,2,8,14,4,3,-1,8,15,4,1,3,-.003627727972343564,.6219773292541504,.4476661086082459,0,2,3,12,2,3,-1,3,13,2,1,3,-.005353075917810202,.1837355047464371,.5102208256721497,0,2,5,6,12,7,-1,9,6,4,7,3,.1453091949224472,.5145987272262573,.1535930931568146,0,2,0,2,3,6,-1,0,4,3,2,3,.0024394490756094456,.5343660116195679,.3624661862850189,0,2,14,6,1,3,-1,14,7,1,1,3,-.003128339070826769,.6215007901191711,.4845592081546783,0,2,2,0,3,14,-1,3,0,1,14,3,.0017940260004252195,.4299261868000031,.5824198126792908,0,2,12,14,5,6,-1,12,16,5,2,3,.0362538211047649,.5260334014892578,.1439467966556549,0,2,4,14,5,6,-1,4,16,5,2,3,-.005174672231078148,.350653886795044,.5287045240402222,0,3,11,10,2,2,-1,12,10,1,1,2,11,11,1,1,2,.0006538329762406647,.4809640944004059,.6122040152549744,0,2,5,0,3,14,-1,6,0,1,14,3,-.0264802295714617,.1139362007379532,.5045586228370667,0,2,10,15,2,3,-1,10,16,2,1,3,-.0030440660193562508,.6352095007896423,.4794734120368958,0,2,0,2,2,3,-1,0,3,2,1,3,.0036993520334362984,.5131118297576904,.2498510926961899,0,2,5,11,12,6,-1,5,14,12,3,2,-.0003676293126773089,.54213947057724,.3709532022476196,0,2,6,11,3,9,-1,6,14,3,3,3,-.041382260620594,.1894959956407547,.5081691741943359,0,3,11,10,2,2,-1,12,10,1,1,2,11,11,1,1,2,-.0010532729793339968,.645436704158783,.4783608913421631,0,2,5,6,1,3,-1,5,7,1,1,3,-.0021648600231856108,.6215031147003174,.449982613325119,0,2,4,9,13,3,-1,4,10,13,1,3,-.0005674774874933064,.3712610900402069,.5419334769248962,0,2,1,7,15,6,-1,6,7,5,6,3,.173758402466774,.5023643970489502,.1215742006897926,0,2,4,5,12,6,-1,8,5,4,6,3,-.0029049699660390615,.3240267932415009,.5381883978843689,0,2,8,10,4,3,-1,8,11,4,1,3,.0012299539521336555,.4165507853031158,.5703486204147339,0,2,15,14,1,3,-1,15,15,1,1,3,-.0005432923790067434,.3854042887687683,.554754912853241,0,2,1,11,5,3,-1,1,12,5,1,3,-.008329725824296474,.2204494029283524,.5097082853317261,0,2,7,1,7,12,-1,7,7,7,6,2,-.00010417630255687982,.560706615447998,.4303036034107208,0,3,0,1,6,10,-1,0,1,3,5,2,3,6,3,5,2,.0312047004699707,.4621657133102417,.6982004046440125,0,2,16,1,4,3,-1,16,2,4,1,3,.007894350215792656,.5269594192504883,.226906806230545,0,2,5,5,2,3,-1,5,6,2,1,3,-.004364531021565199,.6359223127365112,.4537956118583679,0,2,12,2,3,5,-1,13,2,1,5,3,.007679305970668793,.5274767875671387,.274048388004303,0,2,0,3,4,6,-1,0,5,4,2,3,-.0254311393946409,.2038519978523254,.5071732997894287,0,2,8,12,4,2,-1,8,13,4,1,2,.0008200060110539198,.4587455093860626,.6119868159294128,0,2,8,18,3,1,-1,9,18,1,1,3,.002928460016846657,.5071274042129517,.2028204947710037,0,3,11,10,2,2,-1,12,10,1,1,2,11,11,1,1,2,4525647091213614e-20,.4812104105949402,.5430821776390076,0,3,7,10,2,2,-1,7,10,1,1,2,8,11,1,1,2,.0013158309739083052,.4625813961029053,.6779323220252991,0,2,11,11,4,4,-1,11,13,4,2,2,.0015870389761403203,.5386291742324829,.3431465029716492,0,2,8,12,3,8,-1,9,12,1,8,3,-.0215396601706743,.025942500680685,.5003222823143005,0,2,13,0,6,3,-1,13,1,6,1,3,.014334480278194,.5202844738960266,.1590632945299149,0,2,8,8,3,4,-1,9,8,1,4,3,-.008388138376176357,.728248119354248,.4648044109344482,0,3,5,7,10,10,-1,10,7,5,5,2,5,12,5,5,2,.00919068418443203,.556235671043396,.3923191130161285,0,3,3,18,8,2,-1,3,18,4,1,2,7,19,4,1,2,-.005845305975526571,.6803392767906189,.4629127979278565,0,2,10,2,6,8,-1,12,2,2,8,3,-.0547077991068363,.2561671137809753,.5206125974655151,0,2,4,2,6,8,-1,6,2,2,8,3,.009114277549088001,.518962025642395,.3053877055644989,0,2,11,0,3,7,-1,12,0,1,7,3,-.0155750000849366,.1295074969530106,.5169094800949097,0,2,7,11,2,1,-1,8,11,1,1,2,-.0001205060034408234,.5735098123550415,.4230825006961823,0,2,15,14,1,3,-1,15,15,1,1,3,.0012273970060050488,.5289878249168396,.4079791903495789,0,3,7,15,2,2,-1,7,15,1,1,2,8,16,1,1,2,-.0012186600361019373,.6575639843940735,.4574409127235413,0,2,15,14,1,3,-1,15,15,1,1,3,-.0033256649039685726,.3628047108650208,.5195019841194153,0,2,6,0,3,7,-1,7,0,1,7,3,-.0132883097976446,.1284265965223312,.504348874092102,0,2,18,1,2,7,-1,18,1,1,7,2,-.0033839771058410406,.6292240023612976,.475750595331192,0,2,2,0,8,20,-1,2,10,8,10,2,-.2195422053337097,.148773193359375,.5065013766288757,0,2,3,0,15,6,-1,3,2,15,2,3,.004911170806735754,.425610214471817,.5665838718414307,0,2,4,3,12,2,-1,4,4,12,1,2,-.00018744950648397207,.4004144072532654,.5586857199668884,0,2,16,0,4,5,-1,16,0,2,5,2,-.00521786417812109,.6009116172790527,.4812706112861633,0,2,7,0,3,4,-1,8,0,1,4,3,-.0011111519997939467,.3514933884143829,.5287089943885803,0,2,16,0,4,5,-1,16,0,2,5,2,.004403640050441027,.4642275869846344,.5924085974693298,0,2,1,7,6,13,-1,3,7,2,13,3,.1229949966073036,.5025529265403748,.0691524818539619,0,2,16,0,4,5,-1,16,0,2,5,2,-.0123135102912784,.5884591937065125,.4934012889862061,0,2,0,0,4,5,-1,2,0,2,5,2,.004147103987634182,.4372239112854004,.589347779750824,0,2,14,12,3,6,-1,14,14,3,2,3,-.003550264984369278,.4327551126480103,.5396270155906677,0,2,3,12,3,6,-1,3,14,3,2,3,-.0192242693156004,.1913134008646011,.5068330764770508,0,2,16,1,4,3,-1,16,2,4,1,3,.0014395059552043676,.5308178067207336,.424353301525116,0,3,8,7,2,10,-1,8,7,1,5,2,9,12,1,5,2,-.00677519990131259,.6365395784378052,.4540086090564728,0,2,11,11,4,4,-1,11,13,4,2,2,.007011963054537773,.5189834237098694,.302619993686676,0,2,0,1,4,3,-1,0,2,4,1,3,.005401465110480785,.5105062127113342,.2557682991027832,0,2,13,4,1,3,-1,13,5,1,1,3,.0009027498890645802,.4696914851665497,.5861827731132507,0,2,7,15,3,5,-1,8,15,1,5,3,.0114744501188397,.5053645968437195,.152717798948288,0,2,9,7,3,5,-1,10,7,1,5,3,-.006702343001961708,.6508980989456177,.4890604019165039,0,2,8,7,3,5,-1,9,7,1,5,3,-.0020462959073483944,.6241816878318787,.4514600038528442,0,2,10,6,4,14,-1,10,6,2,14,2,-.009995156899094582,.3432781100273132,.5400953888893127,0,2,0,5,5,6,-1,0,7,5,2,3,-.0357007086277008,.1878059059381485,.5074077844619751,0,2,9,5,6,4,-1,9,5,3,4,2,.0004558456130325794,.3805277049541473,.5402569770812988,0,2,0,0,18,10,-1,6,0,6,10,3,-.0542606003582478,.6843714714050293,.4595097005367279,0,2,10,6,4,14,-1,10,6,2,14,2,.0060600461438298225,.5502905249595642,.450052797794342,0,2,6,6,4,14,-1,8,6,2,14,2,-.006479183211922646,.3368858098983765,.5310757160186768,0,2,13,4,1,3,-1,13,5,1,1,3,-.0014939469983801246,.6487640142440796,.4756175875663757,0,2,5,1,2,3,-1,6,1,1,3,2,14610530342906713e-21,.403457909822464,.5451064109802246,0,3,18,1,2,18,-1,19,1,1,9,2,18,10,1,9,2,-.00723219383507967,.6386873722076416,.4824739992618561,0,2,2,1,4,3,-1,2,2,4,1,3,-.004064581822603941,.2986421883106232,.5157335996627808,0,3,18,1,2,18,-1,19,1,1,9,2,18,10,1,9,2,.0304630808532238,.5022199749946594,.7159956097602844,0,3,1,14,4,6,-1,1,14,2,3,2,3,17,2,3,2,-.008054491132497787,.6492452025413513,.4619275033473969,0,2,10,11,7,6,-1,10,13,7,2,3,.0395051389932632,.5150570869445801,.2450613975524902,0,3,0,10,6,10,-1,0,10,3,5,2,3,15,3,5,2,.008453020825982094,.4573669135570526,.6394037008285522,0,2,11,0,3,4,-1,12,0,1,4,3,-.0011688120430335402,.3865512013435364,.548366129398346,0,2,5,10,5,6,-1,5,13,5,3,2,.002807067008689046,.5128579139709473,.2701480090618134,0,2,14,6,1,8,-1,14,10,1,4,2,.000473652093205601,.4051581919193268,.5387461185455322,0,3,1,7,18,6,-1,1,7,9,3,2,10,10,9,3,2,.0117410803213716,.5295950174331665,.3719413876533508,0,2,9,7,2,2,-1,9,7,1,2,2,.0031833238899707794,.4789406955242157,.6895126104354858,0,2,5,9,4,5,-1,7,9,2,5,2,.0007024150108918548,.5384489297866821,.3918080925941467,50.16973114013672,102,0,2,7,6,6,3,-1,9,6,2,3,3,.0170599296689034,.3948527872562408,.7142534852027893,0,2,1,0,18,4,-1,7,0,6,4,3,.0218408405780792,.3370316028594971,.6090016961097717,0,2,7,15,2,4,-1,7,17,2,2,2,.00024520049919374287,.3500576019287109,.5987902283668518,0,2,1,0,19,9,-1,1,3,19,3,3,.008327260613441467,.3267528116703033,.5697240829467773,0,2,3,7,3,6,-1,3,9,3,2,3,.0005714829894714057,.3044599890708923,.5531656742095947,0,3,13,7,4,4,-1,15,7,2,2,2,13,9,2,2,2,.0006737398798577487,.3650012016296387,.567263126373291,0,3,3,7,4,4,-1,3,7,2,2,2,5,9,2,2,2,3468159047770314e-20,.3313541114330292,.5388727188110352,0,2,9,6,10,8,-1,9,10,10,4,2,-.005856339819729328,.2697942852973938,.5498778820037842,0,2,3,8,14,12,-1,3,14,14,6,2,.00851022731512785,.5269358158111572,.2762879133224487,0,3,6,5,10,12,-1,11,5,5,6,2,6,11,5,6,2,-.0698172077536583,.2909603118896484,.5259246826171875,0,2,9,11,2,3,-1,9,12,2,1,3,-.0008611367084085941,.5892577171325684,.4073697924613953,0,2,9,5,6,5,-1,9,5,3,5,2,.0009714924963191152,.3523564040660858,.5415862202644348,0,2,9,4,2,4,-1,9,6,2,2,2,-1472749045206001e-20,.5423017740249634,.3503156006336212,0,2,9,5,6,5,-1,9,5,3,5,2,.0484202913939953,.51939457654953,.3411195874214172,0,2,5,5,6,5,-1,8,5,3,5,2,.0013257140526548028,.315776914358139,.5335376262664795,0,2,11,2,6,1,-1,13,2,2,1,3,1492214960308047e-20,.4451299905776978,.5536553859710693,0,2,3,2,6,1,-1,5,2,2,1,3,-.002717339899390936,.3031741976737976,.5248088836669922,0,2,13,5,2,3,-1,13,6,2,1,3,.0029219500720500946,.4781453013420105,.6606041789054871,0,2,0,10,1,4,-1,0,12,1,2,2,-.0019804988987743855,.3186308145523071,.5287625193595886,0,2,13,5,2,3,-1,13,6,2,1,3,-.004001210909336805,.6413596868515015,.4749928116798401,0,2,8,18,3,2,-1,9,18,1,2,3,-.004349199123680592,.1507498025894165,.5098996758460999,0,2,6,15,9,2,-1,6,16,9,1,2,.0013490889687091112,.4316158890724182,.5881167054176331,0,2,8,14,4,3,-1,8,15,4,1,3,.0185970701277256,.4735553860664368,.9089794158935547,0,2,18,4,2,4,-1,18,6,2,2,2,-.001856237999163568,.3553189039230347,.5577837228775024,0,2,5,5,2,3,-1,5,6,2,1,3,.002294043079018593,.4500094950199127,.6580877900123596,0,2,15,16,3,2,-1,15,17,3,1,2,.00029982850537635386,.5629242062568665,.3975878953933716,0,2,0,0,3,9,-1,0,3,3,3,3,.0035455459728837013,.5381547212600708,.3605485856533051,0,2,9,7,3,3,-1,9,8,3,1,3,.009610472247004509,.5255997180938721,.1796745955944061,0,2,8,7,3,3,-1,8,8,3,1,3,-.0062783220782876015,.227285698056221,.5114030241966248,0,2,9,5,2,6,-1,9,5,1,6,2,.0034598479978740215,.4626308083534241,.6608219146728516,0,2,8,6,3,4,-1,9,6,1,4,3,-.0013112019514665008,.6317539811134338,.4436857998371124,0,3,7,6,8,12,-1,11,6,4,6,2,7,12,4,6,2,.002687617903575301,.5421109795570374,.4054022133350372,0,3,5,6,8,12,-1,5,6,4,6,2,9,12,4,6,2,.003911816980689764,.5358477830886841,.3273454904556274,0,2,12,4,3,3,-1,12,5,3,1,3,-.014206450432539,.7793576717376709,.4975781142711639,0,2,2,16,3,2,-1,2,17,3,1,2,.0007170552853494883,.5297319889068604,.3560903966426849,0,2,12,4,3,3,-1,12,5,3,1,3,.001663501956500113,.467809408903122,.5816481709480286,0,2,2,12,6,6,-1,2,14,6,2,3,.0033686188980937004,.5276734232902527,.3446420133113861,0,2,7,13,6,3,-1,7,14,6,1,3,.0127995302900672,.4834679961204529,.7472159266471863,0,2,6,14,6,3,-1,6,15,6,1,3,.0033901201095432043,.4511859118938446,.6401721239089966,0,2,14,15,5,3,-1,14,16,5,1,3,.004707077983766794,.533565878868103,.355522096157074,0,2,5,4,3,3,-1,5,5,3,1,3,.0014819339849054813,.4250707030296326,.5772724151611328,0,2,14,15,5,3,-1,14,16,5,1,3,-.0069995759986341,.3003320097923279,.5292900204658508,0,2,5,3,6,2,-1,7,3,2,2,3,.0159390103071928,.5067319273948669,.1675581932067871,0,2,8,15,4,3,-1,8,16,4,1,3,.007637734990566969,.4795069992542267,.7085601091384888,0,2,1,15,5,3,-1,1,16,5,1,3,.006733404006808996,.5133113265037537,.2162470072507858,0,3,8,13,4,6,-1,10,13,2,3,2,8,16,2,3,2,-.012858809903264,.1938841938972473,.525137186050415,0,2,7,8,3,3,-1,8,8,1,3,3,-.0006227080011740327,.5686538219451904,.419786810874939,0,2,12,0,5,4,-1,12,2,5,2,2,-.0005265168147161603,.4224168956279755,.5429695844650269,0,3,0,2,20,2,-1,0,2,10,1,2,10,3,10,1,2,.0110750999301672,.5113775134086609,.2514517903327942,0,2,1,0,18,4,-1,7,0,6,4,3,-.0367282517254353,.7194662094116211,.4849618971347809,0,2,4,3,6,1,-1,6,3,2,1,3,-.00028207109426148236,.3840261995792389,.539444625377655,0,2,4,18,13,2,-1,4,19,13,1,2,-.0027489690110087395,.593708872795105,.4569182097911835,0,2,2,10,3,6,-1,2,12,3,2,3,.0100475195795298,.5138576030731201,.2802298069000244,0,3,14,12,6,8,-1,17,12,3,4,2,14,16,3,4,2,-.008149784058332443,.6090037226676941,.4636121094226837,0,3,4,13,10,6,-1,4,13,5,3,2,9,16,5,3,2,-.006883388850837946,.3458611071109772,.5254660248756409,0,2,14,12,1,2,-1,14,13,1,1,2,-140393603942357e-19,.5693104267120361,.4082083106040955,0,2,8,13,4,3,-1,8,14,4,1,3,.001549841952510178,.4350537061691284,.5806517004966736,0,2,14,12,2,2,-1,14,13,2,1,2,-.006784149911254644,.1468873023986816,.5182775259017944,0,2,4,12,2,2,-1,4,13,2,1,2,.00021705629478674382,.5293524265289307,.345617413520813,0,2,8,12,9,2,-1,8,13,9,1,2,.00031198898795992136,.4652450978755951,.5942413806915283,0,2,9,14,2,3,-1,9,15,2,1,3,.005450753029435873,.4653508961200714,.7024846076965332,0,2,11,10,3,6,-1,11,13,3,3,2,-.00025818689027801156,.5497295260429382,.3768967092037201,0,2,5,6,9,12,-1,5,12,9,6,2,-.0174425393342972,.3919087946414948,.5457497835159302,0,2,11,10,3,6,-1,11,13,3,3,2,-.045343529433012,.1631357073783875,.5154908895492554,0,2,6,10,3,6,-1,6,13,3,3,2,.0019190689781680703,.514589786529541,.2791895866394043,0,2,5,4,11,3,-1,5,5,11,1,3,-.006017786916345358,.6517636179924011,.4756332933902741,0,2,7,1,5,10,-1,7,6,5,5,2,-.004072073847055435,.5514652729034424,.4092685878276825,0,2,2,8,18,2,-1,2,9,18,1,2,.00039855059003457427,.316524088382721,.5285550951957703,0,2,7,17,5,3,-1,7,18,5,1,3,-.0065418570302426815,.6853377819061279,.4652808904647827,0,2,5,9,12,1,-1,9,9,4,1,3,.003484508953988552,.5484588146209717,.4502759873867035,0,3,0,14,6,6,-1,0,14,3,3,2,3,17,3,3,2,-.0136967804282904,.6395779848098755,.4572555124759674,0,2,5,9,12,1,-1,9,9,4,1,3,-.017347140237689,.2751072943210602,.5181614756584167,0,2,3,9,12,1,-1,7,9,4,1,3,-.004088542889803648,.3325636088848114,.5194984078407288,0,2,14,10,6,7,-1,14,10,3,7,2,-.009468790143728256,.5942280888557434,.485181987285614,0,2,1,0,16,2,-1,1,1,16,1,2,.0017084840219467878,.4167110919952393,.5519806146621704,0,2,10,9,10,9,-1,10,12,10,3,3,.009480909444391727,.5433894991874695,.4208514988422394,0,2,0,1,10,2,-1,5,1,5,2,2,-.004738965071737766,.6407189965248108,.4560655057430267,0,2,17,3,2,3,-1,17,4,2,1,3,.006576105020940304,.5214555263519287,.2258227020502091,0,2,1,3,2,3,-1,1,4,2,1,3,-.0021690549328923225,.3151527941226959,.5156704783439636,0,2,9,7,3,6,-1,10,7,1,6,3,.014660170301795,.4870837032794952,.668994128704071,0,2,6,5,4,3,-1,8,5,2,3,2,.00017231999663636088,.3569748997688294,.5251078009605408,0,2,7,5,6,6,-1,9,5,2,6,3,-.0218037609010935,.8825920820236206,.496632993221283,0,3,3,4,12,12,-1,3,4,6,6,2,9,10,6,6,2,-.0947361066937447,.1446162015199661,.5061113834381104,0,2,9,2,6,15,-1,11,2,2,15,3,.0055825551971793175,.5396478772163391,.4238066077232361,0,2,2,2,6,17,-1,4,2,2,17,3,.001951709040440619,.4170410931110382,.5497786998748779,0,2,14,10,6,7,-1,14,10,3,7,2,.0121499001979828,.4698367118835449,.5664274096488953,0,2,0,10,6,7,-1,3,10,3,7,2,-.007516962010413408,.6267772912979126,.4463135898113251,0,2,9,2,6,15,-1,11,2,2,15,3,-.0716679096221924,.3097011148929596,.5221003293991089,0,2,5,2,6,15,-1,7,2,2,15,3,-.0882924199104309,.0811238884925842,.5006365180015564,0,2,17,9,3,6,-1,17,11,3,2,3,.0310630798339844,.5155503749847412,.1282255947589874,0,2,6,7,6,6,-1,8,7,2,6,3,.0466218404471874,.4699777960777283,.736396074295044,0,3,1,10,18,6,-1,10,10,9,3,2,1,13,9,3,2,-.0121894897893071,.3920530080795288,.5518996715545654,0,2,0,9,10,9,-1,0,12,10,3,3,.0130161102861166,.5260658264160156,.3685136139392853,0,2,8,15,4,3,-1,8,16,4,1,3,-.003495289944112301,.6339294910430908,.4716280996799469,0,2,5,12,3,4,-1,5,14,3,2,2,-4401503974804655e-20,.5333027243614197,.3776184916496277,0,2,3,3,16,12,-1,3,9,16,6,2,-.1096649020910263,.1765342056751251,.5198346972465515,0,3,1,1,12,12,-1,1,1,6,6,2,7,7,6,6,2,-.0009027955820783973,.5324159860610962,.3838908076286316,0,3,10,4,2,4,-1,11,4,1,2,2,10,6,1,2,2,.0007112664170563221,.4647929966449738,.5755224227905273,0,3,0,9,10,2,-1,0,9,5,1,2,5,10,5,1,2,-.003125027986243367,.323670893907547,.5166770815849304,0,2,9,11,3,3,-1,9,12,3,1,3,.002414467977359891,.4787439107894898,.6459717750549316,0,2,3,12,9,2,-1,3,13,9,1,2,.00044391240226104856,.4409308135509491,.6010255813598633,0,2,9,9,2,2,-1,9,10,2,1,2,-.0002261118934256956,.4038113951683044,.5493255853652954,66.66912078857422,135,0,2,3,4,13,6,-1,3,6,13,2,3,-.0469012893736362,.660017192363739,.3743801116943359,0,3,9,7,6,4,-1,12,7,3,2,2,9,9,3,2,2,-.001456834957934916,.578399121761322,.3437797129154205,0,2,1,0,6,8,-1,4,0,3,8,2,.005559836979955435,.3622266948223114,.5908216238021851,0,2,9,5,2,12,-1,9,11,2,6,2,.0007317048730328679,.550041913986206,.2873558104038239,0,2,4,4,3,10,-1,4,9,3,5,2,.001331800944171846,.267316997051239,.5431019067764282,0,2,6,17,8,3,-1,6,18,8,1,3,.00024347059661522508,.3855027854442596,.574138879776001,0,2,0,5,10,6,-1,0,7,10,2,3,-.0030512469820678234,.5503209829330444,.3462845087051392,0,2,13,2,3,2,-1,13,3,3,1,2,-.0006865719915367663,.3291221857070923,.5429509282112122,0,2,7,5,4,5,-1,9,5,2,5,2,.001466820016503334,.3588382005691528,.5351811051368713,0,2,12,14,3,6,-1,12,16,3,2,3,.0003202187072020024,.429684191942215,.5700234174728394,0,2,1,11,8,2,-1,1,12,8,1,2,.0007412218837998807,.5282164812088013,.3366870880126953,0,2,7,13,6,3,-1,7,14,6,1,3,.0038330298848450184,.4559567868709564,.6257336139678955,0,2,0,5,3,6,-1,0,7,3,2,3,-.0154564399272203,.2350116968154907,.512945294380188,0,2,13,2,3,2,-1,13,3,3,1,2,.002679677912965417,.5329415202140808,.4155062139034271,0,3,4,14,4,6,-1,4,14,2,3,2,6,17,2,3,2,.0028296569362282753,.4273087978363037,.5804538130760193,0,2,13,2,3,2,-1,13,3,3,1,2,-.0039444249123334885,.2912611961364746,.5202686190605164,0,2,8,2,4,12,-1,8,6,4,4,3,.002717955969274044,.5307688117027283,.3585677146911621,0,3,14,0,6,8,-1,17,0,3,4,2,14,4,3,4,2,.005907762795686722,.470377504825592,.5941585898399353,0,2,7,17,3,2,-1,8,17,1,2,3,-.004224034957587719,.2141567021608353,.5088796019554138,0,2,8,12,4,2,-1,8,13,4,1,2,.0040725888684391975,.4766413867473602,.6841061115264893,0,3,6,0,8,12,-1,6,0,4,6,2,10,6,4,6,2,.0101495301350951,.5360798835754395,.3748497068881989,0,3,14,0,2,10,-1,15,0,1,5,2,14,5,1,5,2,-.00018864999583456665,.5720130205154419,.3853805065155029,0,3,5,3,8,6,-1,5,3,4,3,2,9,6,4,3,2,-.0048864358104765415,.3693122863769531,.5340958833694458,0,3,14,0,6,10,-1,17,0,3,5,2,14,5,3,5,2,.0261584799736738,.4962374866008759,.6059989929199219,0,2,9,14,1,2,-1,9,15,1,1,2,.0004856075975112617,.4438945949077606,.6012468934059143,0,2,15,10,4,3,-1,15,11,4,1,3,.0112687097862363,.5244250297546387,.1840388029813767,0,2,8,14,2,3,-1,8,15,2,1,3,-.0028114619199186563,.6060283780097961,.4409897029399872,0,3,3,13,14,4,-1,10,13,7,2,2,3,15,7,2,2,-.005611272994428873,.3891170918941498,.5589237213134766,0,2,1,10,4,3,-1,1,11,4,1,3,.008568009361624718,.5069345831871033,.2062619030475617,0,2,9,11,6,1,-1,11,11,2,1,3,-.00038172779022715986,.5882201790809631,.41926109790802,0,2,5,11,6,1,-1,7,11,2,1,3,-.00017680290329735726,.5533605813980103,.400336891412735,0,2,3,5,16,15,-1,3,10,16,5,3,.006511253770440817,.3310146927833557,.5444191098213196,0,2,6,12,4,2,-1,8,12,2,2,2,-6594868318643421e-20,.5433831810951233,.3944905996322632,0,3,4,4,12,10,-1,10,4,6,5,2,4,9,6,5,2,.006993905175477266,.5600358247756958,.4192714095115662,0,2,8,6,3,4,-1,9,6,1,4,3,-.0046744439750909805,.6685466766357422,.4604960978031158,0,3,8,12,4,8,-1,10,12,2,4,2,8,16,2,4,2,.0115898502990603,.5357121229171753,.2926830053329468,0,2,8,14,4,3,-1,8,15,4,1,3,.013007840141654,.4679817855358124,.730746328830719,0,2,12,2,3,2,-1,13,2,1,2,3,-.0011008579749614,.3937501013278961,.5415065288543701,0,2,8,15,3,2,-1,8,16,3,1,2,.0006047264905646443,.4242376089096069,.5604041218757629,0,2,6,0,9,14,-1,9,0,3,14,3,-.0144948400557041,.3631210029125214,.5293182730674744,0,2,9,6,2,3,-1,10,6,1,3,2,-.005305694881826639,.686045229434967,.4621821045875549,0,2,10,8,2,3,-1,10,9,2,1,3,-.00081829127157107,.3944096863269806,.542043924331665,0,2,0,9,4,6,-1,0,11,4,2,3,-.0190775208175182,.1962621957063675,.5037891864776611,0,2,6,0,8,2,-1,6,1,8,1,2,.00035549470339901745,.4086259007453919,.5613973140716553,0,2,6,14,7,3,-1,6,15,7,1,3,.0019679730758070946,.448912113904953,.5926123261451721,0,2,8,10,8,9,-1,8,13,8,3,3,.006918914150446653,.5335925817489624,.3728385865688324,0,2,5,2,3,2,-1,6,2,1,2,3,.002987277926877141,.5111321210861206,.2975643873214722,0,3,14,1,6,8,-1,17,1,3,4,2,14,5,3,4,2,-.006226461846381426,.5541489720344543,.4824537932872772,0,3,0,1,6,8,-1,0,1,3,4,2,3,5,3,4,2,.013353300280869,.4586423933506012,.6414797902107239,0,3,1,2,18,6,-1,10,2,9,3,2,1,5,9,3,2,.0335052385926247,.5392425060272217,.3429994881153107,0,2,9,3,2,1,-1,10,3,1,1,2,-.0025294460356235504,.1703713983297348,.5013315081596375,0,3,13,2,4,6,-1,15,2,2,3,2,13,5,2,3,2,-.001280162949115038,.5305461883544922,.4697405099868774,0,2,5,4,3,3,-1,5,5,3,1,3,.007068738806992769,.4615545868873596,.643650472164154,0,2,13,5,1,3,-1,13,6,1,1,3,.0009688049904070795,.4833599030971527,.6043894290924072,0,2,2,16,5,3,-1,2,17,5,1,3,.003964765928685665,.5187637209892273,.323181688785553,0,3,13,2,4,6,-1,15,2,2,3,2,13,5,2,3,2,-.022057730704546,.4079256951808929,.520098090171814,0,3,3,2,4,6,-1,3,2,2,3,2,5,5,2,3,2,-.0006690631271339953,.533160924911499,.3815600872039795,0,2,13,5,1,2,-1,13,6,1,1,2,-.0006700932863168418,.5655422210693359,.4688901901245117,0,2,5,5,2,2,-1,5,6,2,1,2,.000742845528293401,.4534381031990051,.6287400126457214,0,2,13,9,2,2,-1,13,9,1,2,2,.0022227810695767403,.5350633263587952,.3303655982017517,0,2,5,9,2,2,-1,6,9,1,2,2,-.005413052160292864,.1113687008619309,.500543475151062,0,2,13,17,3,2,-1,13,18,3,1,2,-14520040167553816e-21,.5628737807273865,.4325133860111237,0,3,6,16,4,4,-1,6,16,2,2,2,8,18,2,2,2,.00023369169502984732,.4165835082530975,.5447791218757629,0,2,9,16,2,3,-1,9,17,2,1,3,.004289454780519009,.4860391020774841,.6778649091720581,0,2,0,13,9,6,-1,0,15,9,2,3,.0059103150852024555,.52623051404953,.3612113893032074,0,2,9,14,2,6,-1,9,17,2,3,2,.0129005396738648,.5319377183914185,.32502880692482,0,2,9,15,2,3,-1,9,16,2,1,3,.004698297940194607,.461824506521225,.6665925979614258,0,2,1,10,18,6,-1,1,12,18,2,3,.0104398597031832,.550567090511322,.3883604109287262,0,2,8,11,4,2,-1,8,12,4,1,2,.0030443191062659025,.4697853028774262,.7301844954490662,0,2,7,9,6,2,-1,7,10,6,1,2,-.0006159375188872218,.3830839097499847,.5464984178543091,0,2,8,8,2,3,-1,8,9,2,1,3,-.0034247159492224455,.256630003452301,.5089530944824219,0,2,17,5,3,4,-1,18,5,1,4,3,-.009353856556117535,.6469966173171997,.49407958984375,0,2,1,19,18,1,-1,7,19,6,1,3,.0523389987647533,.4745982885360718,.787877082824707,0,2,9,0,3,2,-1,10,0,1,2,3,.0035765620414167643,.5306664705276489,.2748498022556305,0,2,1,8,1,6,-1,1,10,1,2,3,.0007155531784519553,.541312575340271,.4041908979415894,0,2,12,17,8,3,-1,12,17,4,3,2,-.0105166798457503,.6158512234687805,.4815283119678497,0,2,0,5,3,4,-1,1,5,1,4,3,.007734792772680521,.4695805907249451,.7028980851173401,0,2,9,7,2,3,-1,9,8,2,1,3,-.004322677850723267,.2849566042423248,.5304684042930603,0,3,7,11,2,2,-1,7,11,1,1,2,8,12,1,1,2,-.0025534399319440126,.7056984901428223,.4688892066478729,0,2,11,3,2,5,-1,11,3,1,5,2,.00010268510231981054,.3902932107448578,.5573464035987854,0,2,7,3,2,5,-1,8,3,1,5,2,7139518857002258e-21,.368423193693161,.526398777961731,0,2,15,13,2,3,-1,15,14,2,1,3,-.0016711989883333445,.3849175870418549,.5387271046638489,0,2,5,6,2,3,-1,5,7,2,1,3,.004926044959574938,.4729771912097931,.7447251081466675,0,2,4,19,15,1,-1,9,19,5,1,3,.0043908702209591866,.4809181094169617,.5591921806335449,0,2,1,19,15,1,-1,6,19,5,1,3,-.0177936293184757,.6903678178787231,.4676927030086517,0,2,15,13,2,3,-1,15,14,2,1,3,.002046966925263405,.5370690226554871,.3308162093162537,0,2,5,0,4,15,-1,7,0,2,15,2,.0298914890736341,.5139865279197693,.3309059143066406,0,2,9,6,2,5,-1,9,6,1,5,2,.0015494900289922953,.466023713350296,.6078342795372009,0,2,9,5,2,7,-1,10,5,1,7,2,.001495696953497827,.4404835999011993,.5863919854164124,0,2,16,11,3,3,-1,16,12,3,1,3,.0009588592802174389,.5435971021652222,.4208523035049439,0,2,1,11,3,3,-1,1,12,3,1,3,.0004964370164088905,.5370578169822693,.4000622034072876,0,2,6,6,8,3,-1,6,7,8,1,3,-.00272808107547462,.5659412741661072,.4259642958641052,0,2,0,15,6,2,-1,0,16,6,1,2,.0023026480339467525,.5161657929420471,.3350869119167328,0,2,1,0,18,6,-1,7,0,6,6,3,.2515163123607636,.4869661927223206,.714730978012085,0,2,6,0,3,4,-1,7,0,1,4,3,-.004632802214473486,.27274489402771,.5083789825439453,0,3,14,10,4,10,-1,16,10,2,5,2,14,15,2,5,2,-.0404344908893108,.6851438879966736,.5021767020225525,0,2,3,2,3,2,-1,4,2,1,2,3,14972220014897175e-21,.428446501493454,.5522555112838745,0,2,11,2,2,2,-1,11,3,2,1,2,-.00024050309730228037,.4226118922233582,.5390074849128723,0,3,2,10,4,10,-1,2,10,2,5,2,4,15,2,5,2,.0236578397452831,.4744631946086884,.7504366040229797,0,3,0,13,20,6,-1,10,13,10,3,2,0,16,10,3,2,-.00814491044729948,.424505889415741,.5538362860679626,0,2,0,5,2,15,-1,1,5,1,15,2,-.003699213033542037,.5952357053756714,.4529713094234467,0,3,1,7,18,4,-1,10,7,9,2,2,1,9,9,2,2,-.0067718601785600185,.4137794077396393,.5473399758338928,0,2,0,0,2,17,-1,1,0,1,17,2,.004266953095793724,.4484114944934845,.5797994136810303,0,3,2,6,16,6,-1,10,6,8,3,2,2,9,8,3,2,.0017791989957913756,.5624858736991882,.4432444870471954,0,2,8,14,1,3,-1,8,15,1,1,3,.0016774770338088274,.4637751877307892,.63642418384552,0,2,8,15,4,2,-1,8,16,4,1,2,.0011732629500329494,.4544503092765808,.5914415717124939,0,3,5,2,8,2,-1,5,2,4,1,2,9,3,4,1,2,.000869981711730361,.5334752798080444,.3885917961597443,0,2,6,11,8,6,-1,6,14,8,3,2,.0007637834060005844,.5398585200309753,.374494194984436,0,2,9,13,2,2,-1,9,14,2,1,2,.00015684569370932877,.4317873120307922,.5614616274833679,0,2,18,4,2,6,-1,18,6,2,2,3,-.0215113703161478,.1785925030708313,.5185542702674866,0,2,9,12,2,2,-1,9,13,2,1,2,.00013081369979772717,.4342499077320099,.5682849884033203,0,2,18,4,2,6,-1,18,6,2,2,3,.021992040798068,.5161716938018799,.2379394024610519,0,2,9,13,1,3,-1,9,14,1,1,3,-.0008013650076463819,.598676323890686,.4466426968574524,0,2,18,4,2,6,-1,18,6,2,2,3,-.008273609913885593,.410821795463562,.5251057147979736,0,2,0,4,2,6,-1,0,6,2,2,3,.0036831789184361696,.5173814296722412,.339751809835434,0,2,9,12,3,3,-1,9,13,3,1,3,-.007952568121254444,.6888983249664307,.4845924079418182,0,2,3,13,2,3,-1,3,14,2,1,3,.0015382299898192286,.5178567171096802,.3454113900661469,0,2,13,13,4,3,-1,13,14,4,1,3,-.0140435304492712,.1678421050310135,.518866777420044,0,2,5,4,3,3,-1,5,5,3,1,3,.0014315890148282051,.436825692653656,.5655773878097534,0,2,5,2,10,6,-1,5,4,10,2,3,-.0340142287313938,.7802296280860901,.4959217011928558,0,2,3,13,4,3,-1,3,14,4,1,3,-.0120272999629378,.1585101038217545,.503223180770874,0,2,3,7,15,5,-1,8,7,5,5,3,.1331661939620972,.5163304805755615,.2755128145217896,0,2,3,7,12,2,-1,7,7,4,2,3,-.0015221949433907866,.372831791639328,.5214552283287048,0,2,10,3,3,9,-1,11,3,1,9,3,-.000939292716793716,.5838379263877869,.4511165022850037,0,2,8,6,4,6,-1,10,6,2,6,2,.0277197398245335,.4728286862373352,.7331544756889343,0,2,9,7,4,3,-1,9,8,4,1,3,.003103015013039112,.5302202105522156,.4101563096046448,0,2,0,9,4,9,-1,2,9,2,9,2,.0778612196445465,.4998334050178528,.127296194434166,0,2,9,13,3,5,-1,10,13,1,5,3,-.0158549398183823,.0508333593606949,.5165656208992004,0,2,7,7,6,3,-1,9,7,2,3,3,-.00497253006324172,.6798133850097656,.4684231877326965,0,2,9,7,3,5,-1,10,7,1,5,3,-.0009767650626599789,.6010771989822388,.4788931906223297,0,2,5,7,8,2,-1,9,7,4,2,2,-.0024647710379213095,.3393397927284241,.5220503807067871,0,2,5,9,12,2,-1,9,9,4,2,3,-.006793770007789135,.4365136921405792,.5239663124084473,0,2,5,6,10,3,-1,10,6,5,3,2,.0326080210506916,.505272388458252,.2425214946269989,0,2,10,12,3,1,-1,11,12,1,1,3,-.0005851442110724747,.5733973979949951,.4758574068546295,0,2,0,1,11,15,-1,0,6,11,5,3,-.0296326000243425,.3892289102077484,.5263597965240479,67.69892120361328,137,0,2,1,0,18,6,-1,7,0,6,6,3,.0465508513152599,.3276950120925903,.6240522861480713,0,2,7,7,6,1,-1,9,7,2,1,3,.007953712716698647,.4256485104560852,.6942939162254333,0,3,5,16,6,4,-1,5,16,3,2,2,8,18,3,2,2,.0006822156137786806,.3711487054824829,.59007328748703,0,2,6,5,9,8,-1,6,9,9,4,2,-.00019348249770700932,.2041133940219879,.53005450963974,0,2,5,10,2,6,-1,5,13,2,3,2,-.0002671050897333771,.5416126251220703,.3103179037570953,0,3,7,6,8,10,-1,11,6,4,5,2,7,11,4,5,2,.0027818060480058193,.5277832746505737,.3467069864273071,0,3,5,6,8,10,-1,5,6,4,5,2,9,11,4,5,2,-.000467790785478428,.5308231115341187,.3294492065906525,0,2,9,5,2,2,-1,9,6,2,1,2,-30335160772665404e-21,.577387273311615,.3852097094058991,0,2,5,12,8,2,-1,5,13,8,1,2,.0007803800981491804,.4317438900470734,.6150057911872864,0,2,10,2,8,2,-1,10,3,8,1,2,-.004255385138094425,.2933903932571411,.5324292778968811,0,3,4,0,2,10,-1,4,0,1,5,2,5,5,1,5,2,-.0002473561035003513,.5468844771385193,.3843030035495758,0,2,9,10,2,2,-1,9,11,2,1,2,-.00014724259381182492,.4281542897224426,.5755587220191956,0,2,2,8,15,3,-1,2,9,15,1,3,.0011864770203828812,.374730110168457,.5471466183662415,0,2,8,13,4,3,-1,8,14,4,1,3,.0023936580400913954,.4537783861160278,.6111528873443604,0,2,7,2,3,2,-1,8,2,1,2,3,-.0015390539774671197,.2971341907978058,.518953800201416,0,2,7,13,6,3,-1,7,14,6,1,3,-.007196879014372826,.6699066758155823,.4726476967334747,0,2,9,9,2,2,-1,9,10,2,1,2,-.0004149978922214359,.3384954035282135,.5260317921638489,0,2,17,2,3,6,-1,17,4,3,2,3,.004435983020812273,.539912223815918,.3920140862464905,0,2,1,5,3,4,-1,2,5,1,4,3,.0026606200262904167,.4482578039169312,.6119617819786072,0,2,14,8,4,6,-1,14,10,4,2,3,-.0015287200221791863,.3711237907409668,.5340266227722168,0,2,1,4,3,8,-1,2,4,1,8,3,-.0047397250309586525,.603108823299408,.4455145001411438,0,2,8,13,4,6,-1,8,16,4,3,2,-.0148291299119592,.2838754057884216,.5341861844062805,0,2,3,14,2,2,-1,3,15,2,1,2,.0009227555710822344,.5209547281265259,.3361653983592987,0,2,14,8,4,6,-1,14,10,4,2,3,.0835298076272011,.5119969844818115,.0811644494533539,0,2,2,8,4,6,-1,2,10,4,2,3,-.0007563314866274595,.331712007522583,.5189831256866455,0,2,10,14,1,6,-1,10,17,1,3,2,.009840385988354683,.524759829044342,.233495905995369,0,2,7,5,3,6,-1,8,5,1,6,3,-.0015953830443322659,.5750094056129456,.4295622110366821,0,3,11,2,2,6,-1,12,2,1,3,2,11,5,1,3,2,34766020689858124e-21,.4342445135116577,.5564029216766357,0,2,6,6,6,5,-1,8,6,2,5,3,.0298629105091095,.4579147100448608,.6579188108444214,0,2,17,1,3,6,-1,17,3,3,2,3,.0113255903124809,.5274311900138855,.3673888146877289,0,2,8,7,3,5,-1,9,7,1,5,3,-.008782864548265934,.7100368738174438,.4642167091369629,0,2,9,18,3,2,-1,10,18,1,2,3,.004363995976746082,.5279216170310974,.2705877125263214,0,2,8,18,3,2,-1,9,18,1,2,3,.004180472809821367,.5072525143623352,.2449083030223846,0,2,12,3,5,2,-1,12,4,5,1,2,-.0004566851130221039,.4283105134963989,.5548691153526306,0,2,7,1,5,12,-1,7,7,5,6,2,-.0037140368949621916,.5519387722015381,.4103653132915497,0,2,1,0,18,4,-1,7,0,6,4,3,-.025304289534688,.6867002248764038,.48698890209198,0,2,4,2,2,2,-1,4,3,2,1,2,-.0003445408074185252,.3728874027729034,.528769314289093,0,3,11,14,4,2,-1,13,14,2,1,2,11,15,2,1,2,-.0008393523166887462,.6060152053833008,.4616062045097351,0,2,0,2,3,6,-1,0,4,3,2,3,.0172800496220589,.5049635767936707,.1819823980331421,0,2,9,7,2,3,-1,9,8,2,1,3,-.006359507795423269,.1631239950656891,.5232778787612915,0,2,5,5,1,3,-1,5,6,1,1,3,.0010298109846189618,.446327805519104,.6176549196243286,0,2,10,10,6,1,-1,10,10,3,1,2,.0010117109632119536,.5473384857177734,.4300698935985565,0,2,4,10,6,1,-1,7,10,3,1,2,-.010308800265193,.1166985034942627,.5000867247581482,0,2,9,17,3,3,-1,9,18,3,1,3,.005468201823532581,.4769287109375,.6719213724136353,0,2,4,14,1,3,-1,4,15,1,1,3,-.0009169646073132753,.3471089899539948,.5178164839744568,0,2,12,5,3,3,-1,12,6,3,1,3,.002392282010987401,.4785236120223999,.6216310858726501,0,2,4,5,12,3,-1,4,6,12,1,3,-.007557381875813007,.5814796090126038,.4410085082054138,0,2,9,8,2,3,-1,9,9,2,1,3,-.0007702403236180544,.387800008058548,.546572208404541,0,2,4,9,3,3,-1,5,9,1,3,3,-.00871259905397892,.1660051047801971,.4995836019515991,0,2,6,0,9,17,-1,9,0,3,17,3,-.0103063201531768,.4093391001224518,.5274233818054199,0,2,9,12,1,3,-1,9,13,1,1,3,-.002094097901135683,.6206194758415222,.4572280049324036,0,2,9,5,2,15,-1,9,10,2,5,3,.006809905171394348,.5567759275436401,.4155600070953369,0,2,8,14,2,3,-1,8,15,2,1,3,-.0010746059706434608,.5638927817344666,.4353024959564209,0,2,10,14,1,3,-1,10,15,1,1,3,.0021550289820879698,.4826265871524811,.6749758124351501,0,2,7,1,6,5,-1,9,1,2,5,3,.0317423194646835,.5048379898071289,.188324898481369,0,2,0,0,20,2,-1,0,0,10,2,2,-.0783827230334282,.2369548976421356,.5260158181190491,0,2,2,13,5,3,-1,2,14,5,1,3,.005741511937230825,.5048828721046448,.2776469886302948,0,2,9,11,2,3,-1,9,12,2,1,3,-.0029014600440859795,.6238604784011841,.4693317115306854,0,2,2,5,9,15,-1,2,10,9,5,3,-.0026427931152284145,.3314141929149628,.5169777274131775,0,3,5,0,12,10,-1,11,0,6,5,2,5,5,6,5,2,-.1094966009259224,.2380045056343079,.5183441042900085,0,2,5,1,2,3,-1,6,1,1,3,2,7407591328956187e-20,.406963586807251,.5362150073051453,0,2,10,7,6,1,-1,12,7,2,1,3,-.0005059380200691521,.5506706237792969,.437459409236908,0,3,3,1,2,10,-1,3,1,1,5,2,4,6,1,5,2,-.0008213177789002657,.5525709986686707,.4209375977516174,0,2,13,7,2,1,-1,13,7,1,1,2,-60276539443293586e-21,.5455474853515625,.4748266041278839,0,2,4,13,4,6,-1,4,15,4,2,3,.006806514225900173,.5157995820045471,.3424577116966248,0,2,13,7,2,1,-1,13,7,1,1,2,.0017202789895236492,.5013207793235779,.6331263780593872,0,2,5,7,2,1,-1,6,7,1,1,2,-.0001301692973356694,.5539718270301819,.4226869940757752,0,3,2,12,18,4,-1,11,12,9,2,2,2,14,9,2,2,-.004801638890057802,.4425095021724701,.5430780053138733,0,3,5,7,2,2,-1,5,7,1,1,2,6,8,1,1,2,-.002539931097999215,.7145782113075256,.4697605073451996,0,2,16,3,4,2,-1,16,4,4,1,2,-.0014278929447755218,.4070445001125336,.539960503578186,0,3,0,2,2,18,-1,0,2,1,9,2,1,11,1,9,2,-.0251425504684448,.7884690761566162,.4747352004051209,0,3,1,2,18,4,-1,10,2,9,2,2,1,4,9,2,2,-.0038899609353393316,.4296191930770874,.5577110052108765,0,2,9,14,1,3,-1,9,15,1,1,3,.004394745919853449,.4693162143230438,.702394425868988,0,3,2,12,18,4,-1,11,12,9,2,2,2,14,9,2,2,.0246784202754498,.5242322087287903,.3812510073184967,0,3,0,12,18,4,-1,0,12,9,2,2,9,14,9,2,2,.0380476787686348,.5011739730834961,.1687828004360199,0,2,11,4,5,3,-1,11,5,5,1,3,.007942486554384232,.4828582108020783,.6369568109512329,0,2,6,4,7,3,-1,6,5,7,1,3,-.0015110049862414598,.5906485915184021,.4487667977809906,0,2,13,17,3,3,-1,13,18,3,1,3,.0064201741479337215,.5241097807884216,.2990570068359375,0,2,8,1,3,4,-1,9,1,1,4,3,-.0029802159406244755,.3041465878486633,.5078489780426025,0,2,11,4,2,4,-1,11,4,1,4,2,-.0007458007894456387,.4128139019012451,.5256826281547546,0,2,0,17,9,3,-1,3,17,3,3,3,-.0104709500446916,.5808395147323608,.4494296014308929,0,3,11,0,2,8,-1,12,0,1,4,2,11,4,1,4,2,.009336920455098152,.524655282497406,.265894889831543,0,3,0,8,6,12,-1,0,8,3,6,2,3,14,3,6,2,.0279369000345469,.4674955010414124,.7087256908416748,0,2,10,7,4,12,-1,10,13,4,6,2,.007427767850458622,.5409486889839172,.3758518099784851,0,2,5,3,8,14,-1,5,10,8,7,2,-.0235845092684031,.3758639991283417,.5238550901412964,0,2,14,10,6,1,-1,14,10,3,1,2,.0011452640173956752,.4329578876495361,.5804247260093689,0,2,0,4,10,4,-1,0,6,10,2,2,-.0004346866044215858,.5280618071556091,.3873069882392883,0,2,10,0,5,8,-1,10,4,5,4,2,.0106485402211547,.4902113080024719,.5681251883506775,0,3,8,1,4,8,-1,8,1,2,4,2,10,5,2,4,2,-.0003941805043723434,.5570880174636841,.4318251013755798,0,2,9,11,6,1,-1,11,11,2,1,3,-.00013270479394122958,.5658439993858337,.4343554973602295,0,2,8,9,3,4,-1,9,9,1,4,3,-.002012551063671708,.6056739091873169,.4537523984909058,0,2,18,4,2,6,-1,18,6,2,2,3,.0024854319635778666,.5390477180480957,.4138010144233704,0,2,8,8,3,4,-1,9,8,1,4,3,.0018237880431115627,.4354828894138336,.5717188715934753,0,2,7,1,13,3,-1,7,2,13,1,3,-.0166566595435143,.3010913133621216,.521612286567688,0,2,7,13,6,1,-1,9,13,2,1,3,.0008034955826587975,.5300151109695435,.3818396925926209,0,2,12,11,3,6,-1,12,13,3,2,3,.003417037893086672,.5328028798103333,.4241400063037872,0,2,5,11,6,1,-1,7,11,2,1,3,-.00036222729249857366,.5491728186607361,.418697714805603,0,3,1,4,18,10,-1,10,4,9,5,2,1,9,9,5,2,-.1163002029061317,.1440722048282623,.522645115852356,0,2,8,6,4,9,-1,8,9,4,3,3,-.0146950101479888,.7747725248336792,.4715717136859894,0,2,8,6,4,3,-1,8,7,4,1,3,.0021972130052745342,.5355433821678162,.3315644860267639,0,2,8,7,3,3,-1,9,7,1,3,3,-.00046965209185145795,.5767235159873962,.4458136856555939,0,2,14,15,4,3,-1,14,16,4,1,3,.006514499895274639,.5215674042701721,.3647888898849487,0,2,5,10,3,10,-1,6,10,1,10,3,.0213000606745481,.4994204938411713,.1567950993776321,0,2,8,15,4,3,-1,8,16,4,1,3,.0031881409231573343,.4742200076580048,.6287270188331604,0,2,0,8,1,6,-1,0,10,1,2,3,.0009001977741718292,.5347954034805298,.394375205039978,0,2,10,15,1,3,-1,10,16,1,1,3,-.005177227780222893,.6727191805839539,.5013138055801392,0,2,2,15,4,3,-1,2,16,4,1,3,-.004376464989036322,.3106675148010254,.5128793120384216,0,3,18,3,2,8,-1,19,3,1,4,2,18,7,1,4,2,.002629996044561267,.488631010055542,.5755215883255005,0,3,0,3,2,8,-1,0,3,1,4,2,1,7,1,4,2,-.002045868895947933,.6025794148445129,.4558076858520508,0,3,3,7,14,10,-1,10,7,7,5,2,3,12,7,5,2,.0694827064871788,.5240747928619385,.2185259014368057,0,2,0,7,19,3,-1,0,8,19,1,3,.0240489393472672,.501186728477478,.2090622037649155,0,2,12,6,3,3,-1,12,7,3,1,3,.003109534038230777,.4866712093353272,.7108548283576965,0,2,0,6,1,3,-1,0,7,1,1,3,-.00125032605137676,.3407891094684601,.5156195163726807,0,2,12,6,3,3,-1,12,7,3,1,3,-.0010281190043315291,.557557225227356,.443943202495575,0,2,5,6,3,3,-1,5,7,3,1,3,-.008889362215995789,.6402000784873962,.4620442092418671,0,2,8,2,4,2,-1,8,3,4,1,2,-.0006109480164013803,.3766441941261292,.5448899865150452,0,2,6,3,4,12,-1,8,3,2,12,2,-.005768635775893927,.3318648934364319,.5133677124977112,0,2,13,6,2,3,-1,13,7,2,1,3,.0018506490159779787,.4903570115566254,.6406934857368469,0,2,0,10,20,4,-1,0,12,20,2,2,-.0997994691133499,.1536051034927368,.5015562176704407,0,2,2,0,17,14,-1,2,7,17,7,2,-.3512834906578064,.0588231310248375,.5174378752708435,0,3,0,0,6,10,-1,0,0,3,5,2,3,5,3,5,2,-.0452445708215237,.6961488723754883,.4677872955799103,0,2,14,6,6,4,-1,14,6,3,4,2,.0714815780520439,.5167986154556274,.1038092970848084,0,2,0,6,6,4,-1,3,6,3,4,2,.0021895780228078365,.4273078143596649,.5532060861587524,0,2,13,2,7,2,-1,13,3,7,1,2,-.0005924265133216977,.46389439702034,.5276389122009277,0,2,0,2,7,2,-1,0,3,7,1,2,.0016788389766588807,.530164897441864,.3932034969329834,0,3,6,11,14,2,-1,13,11,7,1,2,6,12,7,1,2,-.0022163488902151585,.5630694031715393,.4757033884525299,0,3,8,5,2,2,-1,8,5,1,1,2,9,6,1,1,2,.00011568699846975505,.4307535886764526,.5535702705383301,0,2,13,9,2,3,-1,13,9,1,3,2,-.007201728876680136,.144488200545311,.5193064212799072,0,2,1,1,3,12,-1,2,1,1,12,3,.0008908127201721072,.4384432137012482,.5593621134757996,0,2,17,4,1,3,-1,17,5,1,1,3,.00019605009583756328,.5340415835380554,.4705956876277924,0,2,2,4,1,3,-1,2,5,1,1,3,.0005202214233577251,.5213856101036072,.3810079097747803,0,2,14,5,1,3,-1,14,6,1,1,3,.0009458857239224017,.4769414961338043,.6130738854408264,0,2,7,16,2,3,-1,7,17,2,1,3,916984718060121e-19,.4245009124279022,.5429363250732422,0,3,8,13,4,6,-1,10,13,2,3,2,8,16,2,3,2,.002183320000767708,.5457730889320374,.419107586145401,0,2,5,5,1,3,-1,5,6,1,1,3,-.0008603967144154012,.5764588713645935,.4471659958362579,0,2,16,0,4,20,-1,16,0,2,20,2,-.0132362395524979,.6372823119163513,.4695009887218475,0,3,5,1,2,6,-1,5,1,1,3,2,6,4,1,3,2,.0004337670106906444,.5317873954772949,.394582986831665,69.22987365722656,140,0,2,5,4,10,4,-1,5,6,10,2,2,-.024847149848938,.6555516719818115,.3873311877250671,0,2,15,2,4,12,-1,15,2,2,12,2,.006134861148893833,.374807208776474,.5973997712135315,0,2,7,6,4,12,-1,7,12,4,6,2,.006449849810451269,.542549192905426,.2548811137676239,0,2,14,5,1,8,-1,14,9,1,4,2,.0006349121103994548,.2462442070245743,.5387253761291504,0,3,1,4,14,10,-1,1,4,7,5,2,8,9,7,5,2,.0014023890253156424,.5594322085380554,.3528657853603363,0,3,11,6,6,14,-1,14,6,3,7,2,11,13,3,7,2,.0003004400059580803,.3958503901958466,.576593816280365,0,3,3,6,6,14,-1,3,6,3,7,2,6,13,3,7,2,.00010042409849120304,.3698996901512146,.5534998178482056,0,2,4,9,15,2,-1,9,9,5,2,3,-.005084149073809385,.3711090981960297,.5547800064086914,0,2,7,14,6,3,-1,7,15,6,1,3,-.0195372607558966,.7492755055427551,.4579297006130219,0,3,6,3,14,4,-1,13,3,7,2,2,6,5,7,2,2,-7453274065483129e-21,.5649787187576294,.390406996011734,0,2,1,9,15,2,-1,6,9,5,2,3,-.0036079459823668003,.3381088078022003,.5267801284790039,0,2,6,11,8,9,-1,6,14,8,3,3,.002069750102236867,.5519291162490845,.3714388906955719,0,2,7,4,3,8,-1,8,4,1,8,3,-.0004646384040825069,.5608214735984802,.4113566875457764,0,2,14,6,2,6,-1,14,9,2,3,2,.0007549045258201659,.3559206128120422,.532935619354248,0,3,5,7,6,4,-1,5,7,3,2,2,8,9,3,2,2,-.0009832223877310753,.5414795875549316,.3763205111026764,0,2,1,1,18,19,-1,7,1,6,19,3,-.0199406407773495,.634790301322937,.4705299139022827,0,2,1,2,6,5,-1,4,2,3,5,2,.0037680300883948803,.3913489878177643,.5563716292381287,0,2,12,17,6,2,-1,12,18,6,1,2,-.009452850557863712,.2554892897605896,.5215116739273071,0,2,2,17,6,2,-1,2,18,6,1,2,.002956084907054901,.5174679160118103,.3063920140266419,0,2,17,3,3,6,-1,17,5,3,2,3,.009107873775064945,.5388448238372803,.2885963022708893,0,2,8,17,3,3,-1,8,18,3,1,3,.0018219229532405734,.4336043000221252,.58521968126297,0,2,10,13,2,6,-1,10,16,2,3,2,.0146887395530939,.5287361741065979,.2870005965232849,0,2,7,13,6,3,-1,7,14,6,1,3,-.0143879903480411,.701944887638092,.4647370874881744,0,2,17,3,3,6,-1,17,5,3,2,3,-.0189866498112679,.2986552119255066,.5247011780738831,0,2,8,13,2,3,-1,8,14,2,1,3,.0011527639580890536,.4323473870754242,.593166172504425,0,2,9,3,6,2,-1,11,3,2,2,3,.0109336702153087,.5286864042282104,.3130319118499756,0,2,0,3,3,6,-1,0,5,3,2,3,-.0149327302351594,.2658419013023377,.508407711982727,0,2,8,5,4,6,-1,8,7,4,2,3,-.0002997053961735219,.5463526844978333,.374072402715683,0,2,5,5,3,2,-1,5,6,3,1,2,.004167762119323015,.4703496992588043,.7435721755027771,0,2,10,1,3,4,-1,11,1,1,4,3,-.00639053201302886,.2069258987903595,.5280538201332092,0,2,1,2,5,9,-1,1,5,5,3,3,.004502960946410894,.518264889717102,.348354309797287,0,2,13,6,2,3,-1,13,7,2,1,3,-.009204036556184292,.680377721786499,.4932360053062439,0,2,0,6,14,3,-1,7,6,7,3,2,.0813272595405579,.5058398842811584,.2253051996231079,0,2,2,11,18,8,-1,2,15,18,4,2,-.150792807340622,.2963424921035767,.5264679789543152,0,2,5,6,2,3,-1,5,7,2,1,3,.0033179009333252907,.4655495882034302,.7072932124137878,0,3,10,6,4,2,-1,12,6,2,1,2,10,7,2,1,2,.0007740280125290155,.4780347943305969,.5668237805366516,0,3,6,6,4,2,-1,6,6,2,1,2,8,7,2,1,2,.0006819954141974449,.4286996126174927,.5722156763076782,0,2,10,1,3,4,-1,11,1,1,4,3,.0053671570494771,.5299307107925415,.3114621937274933,0,2,7,1,2,7,-1,8,1,1,7,2,9701866656541824e-20,.3674638867378235,.5269461870193481,0,2,4,2,15,14,-1,4,9,15,7,2,-.1253408938646317,.2351492047309876,.5245791077613831,0,2,8,7,3,2,-1,9,7,1,2,3,-.005251626949757338,.7115936875343323,.4693767130374908,0,3,2,3,18,4,-1,11,3,9,2,2,2,5,9,2,2,-.007834210991859436,.4462651014328003,.5409085750579834,0,2,9,7,2,2,-1,10,7,1,2,2,-.001131006982177496,.5945618748664856,.4417662024497986,0,2,13,9,2,3,-1,13,9,1,3,2,.0017601120052859187,.5353249907493591,.3973453044891357,0,2,5,2,6,2,-1,7,2,2,2,3,-.00081581249833107,.3760268092155457,.5264726877212524,0,2,9,5,2,7,-1,9,5,1,7,2,-.003868758911266923,.6309912800788879,.4749819934368134,0,2,5,9,2,3,-1,6,9,1,3,2,.0015207129763439298,.5230181813240051,.3361223936080933,0,2,6,0,14,18,-1,6,9,14,9,2,.545867383480072,.5167139768600464,.1172635033726692,0,2,2,16,6,3,-1,2,17,6,1,3,.0156501904129982,.4979439079761505,.1393294930458069,0,2,9,7,3,6,-1,10,7,1,6,3,-.0117318602278829,.7129650712013245,.4921196103096008,0,2,7,8,4,3,-1,7,9,4,1,3,-.006176512222737074,.2288102954626083,.5049701929092407,0,2,7,12,6,3,-1,7,13,6,1,3,.0022457661107182503,.4632433950901032,.6048725843429565,0,2,9,12,2,3,-1,9,13,2,1,3,-.005191586911678314,.6467421054840088,.4602192938327789,0,2,7,12,6,2,-1,9,12,2,2,3,-.0238278806209564,.1482000946998596,.5226079225540161,0,2,5,11,4,6,-1,5,14,4,3,2,.0010284580057486892,.5135489106178284,.3375957012176514,0,2,11,12,7,2,-1,11,13,7,1,2,-.0100788502022624,.2740561068058014,.5303567051887512,0,3,6,10,8,6,-1,6,10,4,3,2,10,13,4,3,2,.002616893034428358,.533267080783844,.3972454071044922,0,2,11,10,3,4,-1,11,12,3,2,2,.000543853675480932,.5365604162216187,.4063411951065064,0,2,9,16,2,3,-1,9,17,2,1,3,.005351051222532988,.4653759002685547,.6889045834541321,0,2,13,3,1,9,-1,13,6,1,3,3,-.0015274790348485112,.5449501276016235,.3624723851680756,0,2,1,13,14,6,-1,1,15,14,2,3,-.0806244164705276,.1656087040901184,.5000287294387817,0,2,13,6,1,6,-1,13,9,1,3,2,.0221920292824507,.5132731199264526,.2002808004617691,0,2,0,4,3,8,-1,1,4,1,8,3,.007310063112527132,.4617947936058044,.6366536021232605,0,2,18,0,2,18,-1,18,0,1,18,2,-.006406307220458984,.5916250944137573,.4867860972881317,0,2,2,3,6,2,-1,2,4,6,1,2,-.0007641504053026438,.388840913772583,.5315797924995422,0,2,9,0,8,6,-1,9,2,8,2,3,.0007673448999412358,.4159064888954163,.5605279803276062,0,2,6,6,1,6,-1,6,9,1,3,2,.0006147450185380876,.3089022040367127,.5120148062705994,0,2,14,8,6,3,-1,14,9,6,1,3,-.005010527092963457,.3972199857234955,.5207306146621704,0,2,0,0,2,18,-1,1,0,1,18,2,-.008690913207828999,.6257408261299133,.4608575999736786,0,3,1,18,18,2,-1,10,18,9,1,2,1,19,9,1,2,-.016391459852457,.2085209935903549,.5242266058921814,0,2,3,15,2,2,-1,3,16,2,1,2,.00040973909199237823,.5222427248954773,.3780320882797241,0,2,8,14,5,3,-1,8,15,5,1,3,-.002524228999391198,.5803927183151245,.4611890017986298,0,2,8,14,2,3,-1,8,15,2,1,3,.0005094531225040555,.4401271939277649,.5846015810966492,0,2,12,3,3,3,-1,13,3,1,3,3,.001965641975402832,.5322325229644775,.4184590876102448,0,2,7,5,6,2,-1,9,5,2,2,3,.0005629889783449471,.3741844892501831,.5234565734863281,0,2,15,5,5,2,-1,15,6,5,1,2,-.0006794679793529212,.4631041884422302,.5356478095054626,0,2,0,5,5,2,-1,0,6,5,1,2,.007285634987056255,.5044670104980469,.2377564013004303,0,2,17,14,1,6,-1,17,17,1,3,2,-.0174594894051552,.7289121150970459,.5050435066223145,0,2,2,9,9,3,-1,5,9,3,3,3,-.0254217498004436,.6667134761810303,.4678100049495697,0,2,12,3,3,3,-1,13,3,1,3,3,-.0015647639520466328,.4391759037971497,.532362699508667,0,2,0,0,4,18,-1,2,0,2,18,2,.0114443600177765,.4346440136432648,.5680012106895447,0,2,17,6,1,3,-1,17,7,1,1,3,-.0006735255010426044,.44771409034729,.5296812057495117,0,2,2,14,1,6,-1,2,17,1,3,2,.009319420903921127,.4740200042724609,.7462607026100159,0,2,19,8,1,2,-1,19,9,1,1,2,.00013328490604180843,.536506175994873,.475213497877121,0,2,5,3,3,3,-1,6,3,1,3,3,-.007881579920649529,.1752219051122665,.5015255212783813,0,2,9,16,2,3,-1,9,17,2,1,3,-.005798568017780781,.7271236777305603,.4896200895309448,0,2,2,6,1,3,-1,2,7,1,1,3,-.0003892249951604754,.4003908932209015,.5344941020011902,0,3,12,4,8,2,-1,16,4,4,1,2,12,5,4,1,2,-.0019288610201328993,.5605612993240356,.4803955852985382,0,3,0,4,8,2,-1,0,4,4,1,2,4,5,4,1,2,.008421415463089943,.4753246903419495,.7623608708381653,0,2,2,16,18,4,-1,2,18,18,2,2,.008165587671101093,.5393261909484863,.419164389371872,0,2,7,15,2,4,-1,7,17,2,2,2,.00048280550981871784,.4240800142288208,.5399821996688843,0,2,4,0,14,3,-1,4,1,14,1,3,-.002718663075938821,.4244599938392639,.5424923896789551,0,2,0,0,4,20,-1,2,0,2,20,2,-.0125072300434113,.5895841717720032,.4550411105155945,0,3,12,4,4,8,-1,14,4,2,4,2,12,8,2,4,2,-.0242865197360516,.2647134959697723,.518917977809906,0,3,6,7,2,2,-1,6,7,1,1,2,7,8,1,1,2,-.0029676330741494894,.734768271446228,.4749749898910523,0,2,10,6,2,3,-1,10,7,2,1,3,-.0125289997085929,.2756049931049347,.5177599787712097,0,2,8,7,3,2,-1,8,8,3,1,2,-.0010104000102728605,.3510560989379883,.5144724249839783,0,2,8,2,6,12,-1,8,8,6,6,2,-.0021348530426621437,.5637925863265991,.466731995344162,0,2,4,0,11,12,-1,4,4,11,4,3,.0195642597973347,.4614573121070862,.6137639880180359,0,2,14,9,6,11,-1,16,9,2,11,3,-.0971463471651077,.2998378872871399,.5193555951118469,0,2,0,14,4,3,-1,0,15,4,1,3,.00450145686045289,.5077884793281555,.3045755922794342,0,2,9,10,2,3,-1,9,11,2,1,3,.006370697170495987,.486101895570755,.6887500882148743,0,2,5,11,3,2,-1,5,12,3,1,2,-.009072152897715569,.1673395931720734,.5017563104629517,0,2,9,15,3,3,-1,10,15,1,3,3,-.005353720858693123,.2692756950855255,.524263322353363,0,2,8,8,3,4,-1,9,8,1,4,3,-.0109328404068947,.7183864116668701,.4736028909683228,0,2,9,15,3,3,-1,10,15,1,3,3,.008235607296228409,.5223966836929321,.2389862984418869,0,2,7,7,3,2,-1,8,7,1,2,3,-.0010038160253316164,.5719355940818787,.4433943033218384,0,3,2,10,16,4,-1,10,10,8,2,2,2,12,8,2,2,.004085912834852934,.5472841858863831,.4148836135864258,0,2,2,3,4,17,-1,4,3,2,17,2,.1548541933298111,.4973812103271484,.0610615983605385,0,2,15,13,2,7,-1,15,13,1,7,2,.00020897459762636572,.4709174036979675,.542388916015625,0,2,2,2,6,1,-1,5,2,3,1,2,.0003331699117552489,.4089626967906952,.5300992131233215,0,2,5,2,12,4,-1,9,2,4,4,3,-.0108134001493454,.6104369759559631,.4957334101200104,0,3,6,0,8,12,-1,6,0,4,6,2,10,6,4,6,2,.0456560105085373,.5069689154624939,.2866660058498383,0,3,13,7,2,2,-1,14,7,1,1,2,13,8,1,1,2,.0012569549726322293,.484691709280014,.631817102432251,0,2,0,12,20,6,-1,0,14,20,2,3,-.120150700211525,.0605261400341988,.4980959892272949,0,2,14,7,2,3,-1,14,7,1,3,2,-.00010533799650147557,.5363109707832336,.4708042144775391,0,2,0,8,9,12,-1,3,8,3,12,3,-.2070319056510925,.059660330414772,.497909814119339,0,2,3,0,16,2,-1,3,0,8,2,2,.00012909180077258497,.4712977111339569,.5377997756004333,0,2,6,15,3,3,-1,6,16,3,1,3,.000388185289921239,.4363538026809692,.5534191131591797,0,2,8,15,6,3,-1,8,16,6,1,3,-.0029243610333651304,.5811185836791992,.4825215935707092,0,2,0,10,1,6,-1,0,12,1,2,3,.0008388233254663646,.5311700105667114,.403813898563385,0,2,10,9,4,3,-1,10,10,4,1,3,-.0019061550265178084,.3770701885223389,.526001513004303,0,2,9,15,2,3,-1,9,16,2,1,3,.00895143486559391,.4766167998313904,.7682183980941772,0,2,5,7,10,1,-1,5,7,5,1,2,.0130834598094225,.5264462828636169,.3062222003936768,0,2,4,0,12,19,-1,10,0,6,19,2,-.2115933001041412,.6737198233604431,.4695810079574585,0,3,0,6,20,6,-1,10,6,10,3,2,0,9,10,3,2,.0031493250280618668,.5644835233688354,.4386953115463257,0,3,3,6,2,2,-1,3,6,1,1,2,4,7,1,1,2,.00039754100725986063,.4526061117649078,.5895630121231079,0,3,15,6,2,2,-1,16,6,1,1,2,15,7,1,1,2,-.0013814480043947697,.6070582270622253,.4942413866519928,0,3,3,6,2,2,-1,3,6,1,1,2,4,7,1,1,2,-.0005812218878418207,.5998213291168213,.4508252143859863,0,2,14,4,1,12,-1,14,10,1,6,2,-.002390532987192273,.420558899641037,.5223848223686218,0,3,2,5,16,10,-1,2,5,8,5,2,10,10,8,5,2,.0272689294070005,.5206447243690491,.3563301861286163,0,2,9,17,3,2,-1,10,17,1,2,3,-.0037658358924090862,.3144704103469849,.5218814015388489,0,2,1,4,2,2,-1,1,5,2,1,2,-.0014903489500284195,.338019609451294,.5124437212944031,0,2,5,0,15,5,-1,10,0,5,5,3,-.0174282304942608,.5829960703849792,.4919725954532623,0,2,0,0,15,5,-1,5,0,5,5,3,-.0152780301868916,.6163144707679749,.4617887139320374,0,2,11,2,2,17,-1,11,2,1,17,2,.0319956094026566,.5166357159614563,.171276405453682,0,2,7,2,2,17,-1,8,2,1,17,2,-.003825671039521694,.3408012092113495,.5131387710571289,0,2,15,11,2,9,-1,15,11,1,9,2,-.00851864367723465,.6105518937110901,.4997941851615906,0,2,3,11,2,9,-1,4,11,1,9,2,.0009064162150025368,.4327270984649658,.5582311153411865,0,2,5,16,14,4,-1,5,16,7,4,2,.0103448498994112,.4855653047561646,.5452420115470886,79.24907684326172,160,0,2,1,4,18,1,-1,7,4,6,1,3,.007898182608187199,.333252489566803,.5946462154388428,0,3,13,7,6,4,-1,16,7,3,2,2,13,9,3,2,2,.0016170160379260778,.3490641117095947,.5577868819236755,0,2,9,8,2,12,-1,9,12,2,4,3,-.0005544974119402468,.5542566180229187,.3291530013084412,0,2,12,1,6,6,-1,12,3,6,2,3,.001542898011393845,.3612579107284546,.5545979142189026,0,3,5,2,6,6,-1,5,2,3,3,2,8,5,3,3,2,-.0010329450014978647,.3530139029026032,.5576140284538269,0,3,9,16,6,4,-1,12,16,3,2,2,9,18,3,2,2,.0007769815856590867,.3916778862476349,.5645321011543274,0,2,1,2,18,3,-1,7,2,6,3,3,.143203005194664,.4667482078075409,.7023633122444153,0,2,7,4,9,10,-1,7,9,9,5,2,-.007386649027466774,.3073684871196747,.5289257764816284,0,2,5,9,4,4,-1,7,9,2,4,2,-.0006293674232438207,.562211811542511,.4037049114704132,0,2,11,10,3,6,-1,11,13,3,3,2,.0007889352855272591,.5267661213874817,.3557874858379364,0,2,7,11,5,3,-1,7,12,5,1,3,-.0122280502691865,.6668320894241333,.4625549912452698,0,3,7,11,6,6,-1,10,11,3,3,2,7,14,3,3,2,.0035420239437371492,.5521438121795654,.3869673013687134,0,2,0,0,10,9,-1,0,3,10,3,3,-.0010585320414975286,.3628678023815155,.5320926904678345,0,2,13,14,1,6,-1,13,16,1,2,3,14935660146875307e-21,.4632444977760315,.5363323092460632,0,2,0,2,3,6,-1,0,4,3,2,3,.005253770854324102,.5132231712341309,.3265708982944489,0,2,8,14,4,3,-1,8,15,4,1,3,-.008233802393078804,.6693689823150635,.4774140119552612,0,2,6,14,1,6,-1,6,16,1,2,3,2186681012972258e-20,.405386209487915,.5457931160926819,0,2,9,15,2,3,-1,9,16,2,1,3,-.0038150229956954718,.645499587059021,.4793178141117096,0,2,6,4,3,3,-1,7,4,1,3,3,.0011105879675596952,.5270407199859619,.3529678881168366,0,2,9,0,11,3,-1,9,1,11,1,3,-.005770768970251083,.3803547024726868,.5352957844734192,0,2,0,6,20,3,-1,0,7,20,1,3,-.003015833906829357,.533940315246582,.3887133002281189,0,2,10,1,1,2,-1,10,2,1,1,2,-.0008545368909835815,.3564616143703461,.5273603796958923,0,2,9,6,2,6,-1,10,6,1,6,2,.0110505102202296,.4671907126903534,.6849737763404846,0,2,5,8,12,1,-1,9,8,4,1,3,.0426058396697044,.51514732837677,.0702200904488564,0,2,3,8,12,1,-1,7,8,4,1,3,-.0030781750101596117,.3041661083698273,.5152602195739746,0,2,9,7,3,5,-1,10,7,1,5,3,-.005481572821736336,.6430295705795288,.4897229969501495,0,2,3,9,6,2,-1,6,9,3,2,2,.003188186092302203,.5307493209838867,.3826209902763367,0,2,12,9,3,3,-1,12,10,3,1,3,.00035947180003859103,.4650047123432159,.5421904921531677,0,2,7,0,6,1,-1,9,0,2,1,3,-.004070503171533346,.2849679887294769,.5079116225242615,0,2,12,9,3,3,-1,12,10,3,1,3,-.0145941702648997,.2971645891666412,.5128461718559265,0,2,7,10,2,1,-1,8,10,1,1,2,-.00011947689927183092,.563109815120697,.4343082010746002,0,2,6,4,9,13,-1,9,4,3,13,3,-.0006934464909136295,.4403578042984009,.5359959006309509,0,2,6,8,4,2,-1,6,9,4,1,2,14834799912932795e-21,.3421008884906769,.5164697766304016,0,2,16,2,4,6,-1,16,2,2,6,2,.009029698558151722,.4639343023300171,.6114075183868408,0,2,0,17,6,3,-1,0,18,6,1,3,-.008064081892371178,.2820158898830414,.5075494050979614,0,2,10,10,3,10,-1,10,15,3,5,2,.0260621197521687,.5208905935287476,.2688778042793274,0,2,8,7,3,5,-1,9,7,1,5,3,.0173146594315767,.4663713872432709,.6738539934158325,0,2,10,4,4,3,-1,10,4,2,3,2,.0226666405797005,.5209349989891052,.2212723940610886,0,2,8,4,3,8,-1,9,4,1,8,3,-.002196592977270484,.6063101291656494,.4538190066814423,0,2,6,6,9,13,-1,9,6,3,13,3,-.009528247639536858,.4635204970836639,.5247430801391602,0,3,6,0,8,12,-1,6,0,4,6,2,10,6,4,6,2,.00809436198323965,.5289440155029297,.3913882076740265,0,2,14,2,6,8,-1,16,2,2,8,3,-.0728773325681686,.7752001881599426,.4990234971046448,0,2,6,0,3,6,-1,7,0,1,6,3,-.006900952197611332,.2428039014339447,.5048090219497681,0,2,14,2,6,8,-1,16,2,2,8,3,-.0113082397729158,.5734364986419678,.4842376112937927,0,2,0,5,6,6,-1,0,8,6,3,2,.0596132017672062,.5029836297035217,.2524977028369904,0,3,9,12,6,2,-1,12,12,3,1,2,9,13,3,1,2,-.0028624620754271746,.6073045134544373,.4898459911346436,0,2,8,17,3,2,-1,9,17,1,2,3,.00447814492508769,.5015289187431335,.2220316976308823,0,3,11,6,2,2,-1,12,6,1,1,2,11,7,1,1,2,-.001751324045471847,.6614428758621216,.4933868944644928,0,2,1,9,18,2,-1,7,9,6,2,3,.0401634201407433,.5180878043174744,.3741044998168945,0,3,11,6,2,2,-1,12,6,1,1,2,11,7,1,1,2,.0003476894926279783,.4720416963100433,.5818032026290894,0,2,3,4,12,8,-1,7,4,4,8,3,.00265516503714025,.3805010914802551,.5221335887908936,0,2,13,11,5,3,-1,13,12,5,1,3,-.008770627900958061,.294416606426239,.5231295228004456,0,2,9,10,2,3,-1,9,11,2,1,3,-.005512209143489599,.7346177101135254,.4722816944122315,0,2,14,7,2,3,-1,14,7,1,3,2,.0006867204210720956,.5452876091003418,.424241304397583,0,2,5,4,1,3,-1,5,5,1,1,3,.0005601966986432672,.439886212348938,.5601285099983215,0,2,13,4,2,3,-1,13,5,2,1,3,.0024143769405782223,.4741686880588532,.6136621832847595,0,2,5,4,2,3,-1,5,5,2,1,3,-.0015680900542065501,.604455292224884,.4516409933567047,0,2,9,8,2,3,-1,9,9,2,1,3,-.0036827491130679846,.2452459037303925,.5294982194900513,0,2,8,9,2,2,-1,8,10,2,1,2,-.000294091907562688,.3732838034629822,.5251451134681702,0,2,15,14,1,4,-1,15,16,1,2,2,.00042847759323194623,.5498809814453125,.4065535068511963,0,2,3,12,2,2,-1,3,13,2,1,2,-.004881707020103931,.2139908969402313,.4999957084655762,0,3,12,15,2,2,-1,13,15,1,1,2,12,16,1,1,2,.00027272020815871656,.465028703212738,.581342875957489,0,2,9,13,2,2,-1,9,14,2,1,2,.00020947199664078653,.4387486875057221,.5572792887687683,0,2,4,11,14,9,-1,4,14,14,3,3,.0485011897981167,.5244972705841064,.3212889134883881,0,2,7,13,4,3,-1,7,14,4,1,3,-.004516641143709421,.605681300163269,.4545882046222687,0,2,15,14,1,4,-1,15,16,1,2,2,-.0122916800901294,.2040929049253464,.5152214169502258,0,2,4,14,1,4,-1,4,16,1,2,2,.0004854967992287129,.5237604975700378,.3739503026008606,0,2,14,0,6,13,-1,16,0,2,13,3,.0305560491979122,.4960533976554871,.5938246250152588,0,3,4,1,2,12,-1,4,1,1,6,2,5,7,1,6,2,-.00015105320198927075,.5351303815841675,.4145204126834869,0,3,11,14,6,6,-1,14,14,3,3,2,11,17,3,3,2,.0024937440175563097,.4693366885185242,.5514941215515137,0,3,3,14,6,6,-1,3,14,3,3,2,6,17,3,3,2,-.012382130138576,.6791396737098694,.4681667983531952,0,2,14,17,3,2,-1,14,18,3,1,2,-.005133346188813448,.3608739078044891,.5229160189628601,0,2,3,17,3,2,-1,3,18,3,1,2,.0005191927775740623,.5300073027610779,.3633613884449005,0,2,14,0,6,13,-1,16,0,2,13,3,.1506042033433914,.515731692314148,.2211782038211823,0,2,0,0,6,13,-1,2,0,2,13,3,.007714414969086647,.4410496950149536,.5776609182357788,0,2,10,10,7,6,-1,10,12,7,2,3,.009444352239370346,.5401855111122131,.375665009021759,0,3,6,15,2,2,-1,6,15,1,1,2,7,16,1,1,2,.00025006249779835343,.4368270933628082,.5607374906539917,0,3,6,11,8,6,-1,10,11,4,3,2,6,14,4,3,2,-.003307715058326721,.4244799017906189,.551823079586029,0,3,7,6,2,2,-1,7,6,1,1,2,8,7,1,1,2,.0007404891075566411,.4496962130069733,.5900576710700989,0,3,2,2,16,6,-1,10,2,8,3,2,2,5,8,3,2,.0440920516848564,.5293493270874023,.3156355023384094,0,2,5,4,3,3,-1,5,5,3,1,3,.0033639909233897924,.4483296871185303,.5848662257194519,0,2,11,7,3,10,-1,11,12,3,5,2,-.003976007923483849,.4559507071971893,.5483639240264893,0,2,6,7,3,10,-1,6,12,3,5,2,.0027716930489987135,.534178614616394,.3792484104633331,0,2,10,7,3,2,-1,11,7,1,2,3,-.00024123019829858094,.5667188763618469,.4576973021030426,0,2,8,12,4,2,-1,8,13,4,1,2,.0004942566738463938,.4421244859695435,.5628787279129028,0,2,10,1,1,3,-1,10,2,1,1,3,-.0003887646889779717,.4288370907306671,.5391063094139099,0,3,1,2,4,18,-1,1,2,2,9,2,3,11,2,9,2,-.0500488989055157,.6899513006210327,.4703742861747742,0,2,12,4,4,12,-1,12,10,4,6,2,-.0366354808211327,.2217779010534287,.5191826224327087,0,2,0,0,1,6,-1,0,2,1,2,3,.0024273579474538565,.5136224031448364,.3497397899627686,0,2,9,11,2,3,-1,9,12,2,1,3,.001955803018063307,.4826192855834961,.640838086605072,0,2,8,7,4,3,-1,8,8,4,1,3,-.0017494610510766506,.3922835886478424,.5272685289382935,0,2,10,7,3,2,-1,11,7,1,2,3,.0139550799503922,.507820188999176,.8416504859924316,0,2,7,7,3,2,-1,8,7,1,2,3,-.00021896739781368524,.5520489811897278,.4314234852790833,0,2,9,4,6,1,-1,11,4,2,1,3,-.0015131309628486633,.3934605121612549,.5382571220397949,0,2,8,7,2,3,-1,9,7,1,3,2,-.004362280014902353,.7370628714561462,.4736475944519043,0,3,12,7,8,6,-1,16,7,4,3,2,12,10,4,3,2,.0651605874300003,.5159279704093933,.328159511089325,0,3,0,7,8,6,-1,0,7,4,3,2,4,10,4,3,2,-.0023567399475723505,.3672826886177063,.5172886252403259,0,3,18,2,2,10,-1,19,2,1,5,2,18,7,1,5,2,.0151466596871614,.5031493902206421,.6687604188919067,0,2,0,2,6,4,-1,3,2,3,4,2,-.0228509604930878,.676751971244812,.4709596931934357,0,2,9,4,6,1,-1,11,4,2,1,3,.004886765033006668,.5257998108863831,.4059878885746002,0,3,7,15,2,2,-1,7,15,1,1,2,8,16,1,1,2,.0017619599821045995,.4696272909641266,.6688278913497925,0,2,11,13,1,6,-1,11,16,1,3,2,-.0012942519970238209,.4320712983608246,.5344281792640686,0,2,8,13,1,6,-1,8,16,1,3,2,.0109299495816231,.4997706115245819,.1637486070394516,0,2,14,3,2,1,-1,14,3,1,1,2,2995848990394734e-20,.4282417893409729,.5633224248886108,0,2,8,15,2,3,-1,8,16,2,1,3,-.0065884361974895,.677212119102478,.4700526893138886,0,2,12,15,7,4,-1,12,17,7,2,2,.0032527779694646597,.531339704990387,.4536148905754089,0,2,4,14,12,3,-1,4,15,12,1,3,-.00404357397928834,.5660061836242676,.4413388967514038,0,2,10,3,3,2,-1,11,3,1,2,3,-.0012523540062829852,.3731913864612579,.5356451869010925,0,2,4,12,2,2,-1,4,13,2,1,2,.00019246719602961093,.5189986228942871,.3738811016082764,0,2,10,11,4,6,-1,10,14,4,3,2,-.038589671254158,.2956373989582062,.51888108253479,0,3,7,13,2,2,-1,7,13,1,1,2,8,14,1,1,2,.0001548987056594342,.4347135126590729,.5509533286094666,0,3,4,11,14,4,-1,11,11,7,2,2,4,13,7,2,2,-.0337638482451439,.3230330049991608,.5195475816726685,0,2,1,18,18,2,-1,7,18,6,2,3,-.008265706710517406,.5975489020347595,.4552114009857178,0,3,11,18,2,2,-1,12,18,1,1,2,11,19,1,1,2,14481440302915871e-21,.4745678007602692,.5497426986694336,0,3,7,18,2,2,-1,7,18,1,1,2,8,19,1,1,2,14951299817766994e-21,.4324473142623901,.5480644106864929,0,2,12,18,8,2,-1,12,19,8,1,2,-.018741799518466,.1580052971839905,.517853319644928,0,2,7,14,6,2,-1,7,15,6,1,2,.0017572239739820361,.4517636895179749,.5773764252662659,0,3,8,12,4,8,-1,10,12,2,4,2,8,16,2,4,2,-.0031391119118779898,.4149647951126099,.5460842251777649,0,2,4,9,3,3,-1,4,10,3,1,3,6665677938144654e-20,.4039090871810913,.5293084979057312,0,2,7,10,6,2,-1,9,10,2,2,3,.006774342153221369,.4767651855945587,.612195611000061,0,2,5,0,4,15,-1,7,0,2,15,2,-.0073868161998689175,.3586258888244629,.5187280774116516,0,2,8,6,12,14,-1,12,6,4,14,3,.0140409301966429,.4712139964103699,.5576155781745911,0,2,5,16,3,3,-1,5,17,3,1,3,-.005525832995772362,.2661027014255524,.5039281249046326,0,2,8,1,12,19,-1,12,1,4,19,3,.3868423998355866,.5144339799880981,.2525899112224579,0,2,3,0,3,2,-1,3,1,3,1,2,.0001145924034062773,.4284994900226593,.5423371195793152,0,2,10,12,4,5,-1,10,12,2,5,2,-.0184675697237253,.3885835111141205,.5213062167167664,0,2,6,12,4,5,-1,8,12,2,5,2,-.0004590701137203723,.541256308555603,.4235909879207611,0,3,11,11,2,2,-1,12,11,1,1,2,11,12,1,1,2,.0012527540093287826,.4899305105209351,.6624091267585754,0,2,0,2,3,6,-1,0,4,3,2,3,.001491060946136713,.5286778211593628,.4040051996707916,0,3,11,11,2,2,-1,12,11,1,1,2,11,12,1,1,2,-.0007543556275777519,.6032990217208862,.4795120060443878,0,2,7,6,4,10,-1,7,11,4,5,2,-.0069478838704526424,.408440113067627,.5373504161834717,0,3,11,11,2,2,-1,12,11,1,1,2,11,12,1,1,2,.0002809292054735124,.4846062958240509,.5759382247924805,0,2,2,13,5,2,-1,2,14,5,1,2,.0009607371757738292,.5164741277694702,.3554979860782623,0,3,11,11,2,2,-1,12,11,1,1,2,11,12,1,1,2,-.0002688392996788025,.5677582025527954,.4731765985488892,0,3,7,11,2,2,-1,7,11,1,1,2,8,12,1,1,2,.0021599370520561934,.4731487035751343,.7070567011833191,0,2,14,13,3,3,-1,14,14,3,1,3,.005623530130833387,.5240243077278137,.2781791985034943,0,2,3,13,3,3,-1,3,14,3,1,3,-.005024399142712355,.2837013900279999,.5062304139137268,0,2,9,14,2,3,-1,9,15,2,1,3,-.009761163964867592,.7400717735290527,.4934569001197815,0,2,8,7,3,3,-1,8,8,3,1,3,.004151510074734688,.5119131207466125,.3407008051872253,0,2,13,5,3,3,-1,13,6,3,1,3,.006246508099138737,.4923788011074066,.6579058766365051,0,2,0,9,5,3,-1,0,10,5,1,3,-.007059747818857431,.2434711009263992,.503284215927124,0,2,13,5,3,3,-1,13,6,3,1,3,-.0020587709732353687,.590031087398529,.469508707523346,0,3,9,12,2,8,-1,9,12,1,4,2,10,16,1,4,2,-.0024146060459315777,.3647317886352539,.5189201831817627,0,3,11,7,2,2,-1,12,7,1,1,2,11,8,1,1,2,-.0014817609917372465,.6034948229789734,.4940128028392792,0,2,0,16,6,4,-1,3,16,3,4,2,-.0063016400672495365,.5818989872932434,.4560427963733673,0,2,10,6,2,3,-1,10,7,2,1,3,.00347634288482368,.5217475891113281,.3483993113040924,0,2,9,5,2,6,-1,9,7,2,2,3,-.0222508702427149,.2360700070858002,.5032082796096802,0,2,12,15,8,4,-1,12,15,4,4,2,-.030612550675869,.6499186754226685,.4914919137954712,0,2,0,14,8,6,-1,4,14,4,6,2,.013057479634881,.4413323104381561,.5683764219284058,0,2,9,0,3,2,-1,10,0,1,2,3,-.0006009574281051755,.4359731078147888,.5333483219146729,0,2,4,15,4,2,-1,6,15,2,2,2,-.0004151425091549754,.550406277179718,.4326060116291046,0,2,12,7,3,13,-1,13,7,1,13,3,-.013776290230453,.4064112901687622,.5201548933982849,0,2,5,7,3,13,-1,6,7,1,13,3,-.0322965085506439,.0473519712686539,.4977194964885712,0,2,9,6,3,9,-1,9,9,3,3,3,.0535569787025452,.4881733059883118,.666693925857544,0,2,4,4,7,12,-1,4,10,7,6,2,.008188954554498196,.5400037169456482,.4240820109844208,0,3,12,12,2,2,-1,13,12,1,1,2,12,13,1,1,2,.00021055320394225419,.4802047908306122,.5563852787017822,0,3,6,12,2,2,-1,6,12,1,1,2,7,13,1,1,2,-.00243827304802835,.7387793064117432,.4773685038089752,0,3,8,9,4,2,-1,10,9,2,1,2,8,10,2,1,2,.003283557016402483,.5288546085357666,.3171291947364807,0,3,3,6,2,2,-1,3,6,1,1,2,4,7,1,1,2,.00237295706756413,.4750812947750092,.7060170769691467,0,2,16,6,3,2,-1,16,7,3,1,2,-.0014541699783876538,.3811730146408081,.533073902130127,87.69602966308594,177,0,2,0,7,19,4,-1,0,9,19,2,2,.0557552389800549,.4019156992435455,.6806036829948425,0,2,10,2,10,1,-1,10,2,5,1,2,.002473024884238839,.3351148962974548,.5965719819068909,0,2,9,4,2,12,-1,9,10,2,6,2,-.00035031698644161224,.5557708144187927,.3482286930084229,0,2,12,18,4,1,-1,12,18,2,1,2,.0005416763015091419,.426085889339447,.5693380832672119,0,3,1,7,6,4,-1,1,7,3,2,2,4,9,3,2,2,.0007719367858953774,.3494240045547485,.5433688759803772,0,2,12,0,6,13,-1,14,0,2,13,3,-.0015999219613149762,.4028499126434326,.5484359264373779,0,2,2,0,6,13,-1,4,0,2,13,3,-.00011832080053864047,.3806901872158051,.5425465106964111,0,2,10,5,8,8,-1,10,9,8,4,2,.0003290903114248067,.262010008096695,.5429521799087524,0,2,8,3,2,5,-1,9,3,1,5,2,.0002951810893137008,.379976898431778,.5399264097213745,0,2,8,4,9,1,-1,11,4,3,1,3,9046671038959175e-20,.4433645009994507,.5440226197242737,0,2,3,4,9,1,-1,6,4,3,1,3,15007190086180344e-21,.3719654977321625,.5409119725227356,0,2,1,0,18,10,-1,7,0,6,10,3,.1393561065196991,.552539587020874,.4479042887687683,0,2,7,17,5,3,-1,7,18,5,1,3,.0016461990308016539,.4264501035213471,.5772169828414917,0,2,7,11,6,1,-1,9,11,2,1,3,.0004998443182557821,.4359526038169861,.5685871243476868,0,2,2,2,3,2,-1,2,3,3,1,2,-.001097128028050065,.3390136957168579,.5205408930778503,0,2,8,12,4,2,-1,8,13,4,1,2,.0006691989256069064,.4557456076145172,.598065972328186,0,2,6,10,3,6,-1,6,13,3,3,2,.0008647104259580374,.5134841203689575,.2944033145904541,0,2,11,4,2,4,-1,11,4,1,4,2,-.0002718259929679334,.3906578123569489,.5377181172370911,0,2,7,4,2,4,-1,8,4,1,4,2,3024949910468422e-20,.3679609894752502,.5225688815116882,0,2,9,6,2,4,-1,9,6,1,4,2,-.008522589690983295,.7293102145195007,.4892365038394928,0,2,6,13,8,3,-1,6,14,8,1,3,.0016705560265108943,.43453249335289,.5696138143539429,0,2,9,15,3,4,-1,10,15,1,4,3,-.0071433838456869125,.2591280043125153,.5225623846054077,0,2,9,2,2,17,-1,10,2,1,17,2,-.0163193698972464,.6922279000282288,.4651575982570648,0,2,7,0,6,1,-1,9,0,2,1,3,.004803426098078489,.5352262854576111,.3286302983760834,0,2,8,15,3,4,-1,9,15,1,4,3,-.0075421929359436035,.2040544003248215,.5034546256065369,0,2,7,13,7,3,-1,7,14,7,1,3,-.0143631100654602,.6804888844490051,.4889059066772461,0,2,8,16,3,3,-1,9,16,1,3,3,.0008906358852982521,.5310695767402649,.3895480930805206,0,2,6,2,8,10,-1,6,7,8,5,2,-.004406019113957882,.5741562843322754,.4372426867485046,0,2,2,5,8,8,-1,2,9,8,4,2,-.0001886254030978307,.2831785976886749,.5098205208778381,0,2,14,16,2,2,-1,14,17,2,1,2,-.0037979281041771173,.3372507989406586,.5246580243110657,0,2,4,16,2,2,-1,4,17,2,1,2,.00014627049677073956,.5306674242019653,.391171008348465,0,2,10,11,4,6,-1,10,14,4,3,2,-49164638767251745e-21,.5462496280670166,.3942720890045166,0,2,6,11,4,6,-1,6,14,4,3,2,-.0335825011134148,.2157824039459229,.5048211812973022,0,2,10,14,1,3,-1,10,15,1,1,3,-.0035339309833943844,.6465312242507935,.4872696995735169,0,2,8,14,4,3,-1,8,15,4,1,3,.005014411173760891,.4617668092250824,.6248074769973755,0,3,10,0,4,6,-1,12,0,2,3,2,10,3,2,3,2,.0188173707574606,.5220689177513123,.2000052034854889,0,2,0,3,20,2,-1,0,4,20,1,2,-.001343433978036046,.4014537930488586,.53016197681427,0,3,12,0,8,2,-1,16,0,4,1,2,12,1,4,1,2,.001755796023644507,.4794039130210877,.5653169751167297,0,2,2,12,10,8,-1,2,16,10,4,2,-.0956374630331993,.2034195065498352,.5006706714630127,0,3,17,7,2,10,-1,18,7,1,5,2,17,12,1,5,2,-.0222412291914225,.7672473192214966,.5046340227127075,0,3,1,7,2,10,-1,1,7,1,5,2,2,12,1,5,2,-.0155758196488023,.7490342259407043,.4755851030349731,0,2,15,10,3,6,-1,15,12,3,2,3,.005359911825507879,.5365303754806519,.4004670977592468,0,2,4,4,6,2,-1,6,4,2,2,3,-.0217634998261929,.0740154981613159,.4964174926280975,0,2,0,5,20,6,-1,0,7,20,2,3,-.165615901350975,.2859103083610535,.5218086242675781,0,3,0,0,8,2,-1,0,0,4,1,2,4,1,4,1,2,.0001646132004680112,.4191615879535675,.5380793213844299,0,2,1,0,18,4,-1,7,0,6,4,3,-.008907750248908997,.6273192763328552,.4877404868602753,0,2,1,13,6,2,-1,1,14,6,1,2,.0008634644909761846,.5159940719604492,.3671025931835175,0,2,10,8,3,4,-1,11,8,1,4,3,-.0013751760125160217,.5884376764297485,.4579083919525147,0,2,6,1,6,1,-1,8,1,2,1,3,-.0014081239933148026,.3560509979724884,.5139945149421692,0,2,8,14,4,3,-1,8,15,4,1,3,-.003934288863092661,.5994288921356201,.466427206993103,0,2,1,6,18,2,-1,10,6,9,2,2,-.0319669283926487,.3345462083816528,.5144183039665222,0,2,15,11,1,2,-1,15,12,1,1,2,-15089280168467667e-21,.5582656264305115,.441405713558197,0,2,6,5,1,2,-1,6,6,1,1,2,.0005199447041377425,.4623680114746094,.6168993711471558,0,2,13,4,1,3,-1,13,5,1,1,3,-.0034220460802316666,.6557074785232544,.4974805116653442,0,2,2,15,1,2,-1,2,16,1,1,2,.00017723299970384687,.5269501805305481,.3901908099651337,0,2,12,4,4,3,-1,12,5,4,1,3,.0015716759953647852,.4633373022079468,.5790457725524902,0,2,0,0,7,3,-1,0,1,7,1,3,-.00890413299202919,.2689608037471771,.5053591132164001,0,2,9,12,6,2,-1,9,12,3,2,2,.00040677518700249493,.5456603169441223,.4329898953437805,0,2,5,4,2,3,-1,5,5,2,1,3,.0067604780197143555,.4648993909358978,.6689761877059937,0,2,18,4,2,3,-1,18,5,2,1,3,.0029100088868290186,.5309703946113586,.3377839922904968,0,2,3,0,8,6,-1,3,2,8,2,3,.0013885459629818797,.4074738919734955,.5349133014678955,0,3,0,2,20,6,-1,10,2,10,3,2,0,5,10,3,2,-.0767642632126808,.1992176026105881,.522824227809906,0,2,4,7,2,4,-1,5,7,1,4,2,-.00022688310127705336,.5438501834869385,.4253072142601013,0,2,3,10,15,2,-1,8,10,5,2,3,-.006309415213763714,.4259178936481476,.5378909707069397,0,2,3,0,12,11,-1,9,0,6,11,2,-.1100727990269661,.6904156804084778,.4721749126911163,0,2,13,0,2,6,-1,13,0,1,6,2,.0002861965913325548,.4524914920330048,.5548306107521057,0,2,0,19,2,1,-1,1,19,1,1,2,2942532955785282e-20,.5370373725891113,.4236463904380798,0,3,16,10,4,10,-1,18,10,2,5,2,16,15,2,5,2,-.0248865708708763,.6423557996749878,.4969303905963898,0,2,4,8,10,3,-1,4,9,10,1,3,.0331488512456417,.4988475143909454,.1613811999559403,0,2,14,12,3,3,-1,14,13,3,1,3,.0007849169196560979,.541602611541748,.4223009049892426,0,3,0,10,4,10,-1,0,10,2,5,2,2,15,2,5,2,.004708718974143267,.4576328992843628,.6027557849884033,0,2,18,3,2,6,-1,18,5,2,2,3,.0024144479539245367,.530897319316864,.4422498941421509,0,2,6,6,1,3,-1,6,7,1,1,3,.0019523180089890957,.4705634117126465,.666332483291626,0,2,7,7,7,2,-1,7,8,7,1,2,.0013031980488449335,.4406126141548157,.5526962280273438,0,2,0,3,2,6,-1,0,5,2,2,3,.004473549779504538,.5129023790359497,.3301498889923096,0,2,11,1,3,1,-1,12,1,1,1,3,-.002665286883711815,.3135471045970917,.5175036191940308,0,2,5,0,2,6,-1,6,0,1,6,2,.0001366677024634555,.4119370877742767,.530687689781189,0,2,1,1,18,14,-1,7,1,6,14,3,-.0171264503151178,.6177806258201599,.4836578965187073,0,2,4,6,8,3,-1,8,6,4,3,2,-.0002660143072716892,.3654330968856812,.5169736742973328,0,2,9,12,6,2,-1,9,12,3,2,2,-.022932380437851,.349091500043869,.5163992047309875,0,2,5,12,6,2,-1,8,12,3,2,2,.0023316550068557262,.5166299939155579,.3709389865398407,0,2,10,7,3,5,-1,11,7,1,5,3,.016925660893321,.501473605632782,.8053988218307495,0,2,7,7,3,5,-1,8,7,1,5,3,-.008985882624983788,.6470788717269897,.465702086687088,0,2,13,0,3,10,-1,14,0,1,10,3,-.0118746999651194,.3246378898620606,.5258755087852478,0,2,4,11,3,2,-1,4,12,3,1,2,.00019350569345988333,.5191941857337952,.3839643895626068,0,2,17,3,3,6,-1,18,3,1,6,3,.005871349014341831,.4918133914470673,.6187043190002441,0,2,1,8,18,10,-1,1,13,18,5,2,-.2483879029750824,.1836802959442139,.4988150000572205,0,2,13,0,3,10,-1,14,0,1,10,3,.0122560001909733,.5227053761482239,.3632029891014099,0,2,9,14,2,3,-1,9,15,2,1,3,.0008399017970077693,.4490250051021576,.5774148106575012,0,2,16,3,3,7,-1,17,3,1,7,3,.002540736924856901,.4804787039756775,.5858299136161804,0,2,4,0,3,10,-1,5,0,1,10,3,-.0148224299773574,.2521049976348877,.5023537278175354,0,2,16,3,3,7,-1,17,3,1,7,3,-.005797395948320627,.5996695756912231,.4853715002536774,0,2,0,9,1,2,-1,0,10,1,1,2,.000726621481589973,.5153716802597046,.3671779930591583,0,2,18,1,2,10,-1,18,1,1,10,2,-.0172325801104307,.6621719002723694,.4994656145572662,0,2,0,1,2,10,-1,1,1,1,10,2,.007862408645451069,.4633395075798035,.6256101727485657,0,2,10,16,3,4,-1,11,16,1,4,3,-.004734362009912729,.3615573048591614,.5281885266304016,0,2,2,8,3,3,-1,3,8,1,3,3,.0008304847870022058,.4442889094352722,.5550957918167114,0,3,11,0,2,6,-1,12,0,1,3,2,11,3,1,3,2,.00766021991148591,.5162935256958008,.2613354921340942,0,3,7,0,2,6,-1,7,0,1,3,2,8,3,1,3,2,-.004104837775230408,.2789632081985474,.5019031763076782,0,2,16,3,3,7,-1,17,3,1,7,3,.004851257894188166,.4968984127044678,.5661668181419373,0,2,1,3,3,7,-1,2,3,1,7,3,.0009989645332098007,.4445607960224152,.5551813244819641,0,2,14,1,6,16,-1,16,1,2,16,3,-.2702363133430481,.0293882098048925,.515131413936615,0,2,0,1,6,16,-1,2,1,2,16,3,-.0130906803533435,.5699399709701538,.4447459876537323,0,3,2,0,16,8,-1,10,0,8,4,2,2,4,8,4,2,-.009434279054403305,.4305466115474701,.5487895011901855,0,2,6,8,5,3,-1,6,9,5,1,3,-.0015482039889320731,.3680317103862763,.512808084487915,0,2,9,7,3,3,-1,10,7,1,3,3,.005374613218009472,.4838916957378388,.6101555824279785,0,2,8,8,4,3,-1,8,9,4,1,3,.0015786769799888134,.5325223207473755,.4118548035621643,0,2,9,6,2,4,-1,9,6,1,4,2,.003685605013743043,.4810948073863983,.6252303123474121,0,2,0,7,15,1,-1,5,7,5,1,3,.009388701990246773,.520022988319397,.3629410862922669,0,2,8,2,7,9,-1,8,5,7,3,3,.0127926301211119,.4961709976196289,.673801600933075,0,3,1,7,16,4,-1,1,7,8,2,2,9,9,8,2,2,-.003366104094311595,.4060279130935669,.5283598899841309,0,2,6,12,8,2,-1,6,13,8,1,2,.00039771420415490866,.4674113988876343,.5900775194168091,0,2,8,11,3,3,-1,8,12,3,1,3,.0014868030557408929,.4519116878509522,.6082053780555725,0,3,4,5,14,10,-1,11,5,7,5,2,4,10,7,5,2,-.0886867493391037,.2807899117469788,.5180991888046265,0,2,4,12,3,2,-1,4,13,3,1,2,-7429611287079751e-20,.5295584201812744,.408762514591217,0,2,9,11,6,1,-1,11,11,2,1,3,-14932939848222304e-21,.5461400151252747,.4538542926311493,0,2,4,9,7,6,-1,4,11,7,2,3,.005916223861277103,.5329161286354065,.4192134141921997,0,2,7,10,6,3,-1,7,11,6,1,3,.001114164013415575,.4512017965316773,.5706217288970947,0,2,9,11,2,2,-1,9,12,2,1,2,8924936264520511e-20,.4577805995941162,.5897638201713562,0,2,0,5,20,6,-1,0,7,20,2,3,.0025319510605186224,.5299603939056396,.3357639014720917,0,2,6,4,6,1,-1,8,4,2,1,3,.0124262003228068,.4959059059619904,.1346601992845535,0,2,9,11,6,1,-1,11,11,2,1,3,.0283357501029968,.5117079019546509,.0006104363710619509,0,2,5,11,6,1,-1,7,11,2,1,3,.006616588216274977,.4736349880695343,.7011628150939941,0,2,10,16,3,4,-1,11,16,1,4,3,.008046876639127731,.5216417908668518,.3282819986343384,0,2,8,7,3,3,-1,9,7,1,3,3,-.001119398046284914,.5809860825538635,.4563739001750946,0,2,2,12,16,8,-1,2,16,16,4,2,.0132775902748108,.5398362278938293,.4103901088237763,0,2,0,15,15,2,-1,0,16,15,1,2,.0004879473999608308,.424928605556488,.5410590767860413,0,2,15,4,5,6,-1,15,6,5,2,3,.0112431701272726,.526996374130249,.3438215851783752,0,2,9,5,2,4,-1,10,5,1,4,2,-.0008989666821435094,.5633075833320618,.4456613063812256,0,2,8,10,9,6,-1,8,12,9,2,3,.006667715962976217,.5312889218330383,.4362679123878479,0,2,2,19,15,1,-1,7,19,5,1,3,.0289472993463278,.4701794981956482,.657579779624939,0,2,10,16,3,4,-1,11,16,1,4,3,-.0234000496566296,0,.5137398838996887,0,2,0,15,20,4,-1,0,17,20,2,2,-.0891170501708984,.0237452797591686,.4942430853843689,0,2,10,16,3,4,-1,11,16,1,4,3,-.0140546001493931,.3127323091030121,.511751115322113,0,2,7,16,3,4,-1,8,16,1,4,3,.008123939856886864,.50090491771698,.2520025968551636,0,2,9,16,3,3,-1,9,17,3,1,3,-.004996465053409338,.6387143731117249,.4927811920642853,0,2,8,11,4,6,-1,8,14,4,3,2,.0031253970228135586,.5136849880218506,.3680452108383179,0,2,9,6,2,12,-1,9,10,2,4,3,.006766964215785265,.5509843826293945,.4363631904125214,0,2,8,17,4,3,-1,8,18,4,1,3,-.002371144015341997,.6162335276603699,.4586946964263916,0,3,9,18,8,2,-1,13,18,4,1,2,9,19,4,1,2,-.005352279171347618,.6185457706451416,.4920490980148315,0,2,1,18,8,2,-1,1,19,8,1,2,-.0159688591957092,.1382617950439453,.4983252882957459,0,2,13,5,6,15,-1,15,5,2,15,3,.004767606034874916,.4688057899475098,.5490046143531799,0,2,9,8,2,2,-1,9,9,2,1,2,-.002471469109877944,.2368514984846115,.5003952980041504,0,2,9,5,2,3,-1,9,5,1,3,2,-.0007103378884494305,.5856394171714783,.4721533060073853,0,2,1,5,6,15,-1,3,5,2,15,3,-.1411755979061127,.0869000628590584,.4961591064929962,0,3,4,1,14,8,-1,11,1,7,4,2,4,5,7,4,2,.1065180972218514,.5138837099075317,.1741005033254623,0,3,2,4,4,16,-1,2,4,2,8,2,4,12,2,8,2,-.0527447499334812,.7353636026382446,.4772881865501404,0,2,12,4,3,12,-1,12,10,3,6,2,-.00474317604675889,.3884406089782715,.5292701721191406,0,3,4,5,10,12,-1,4,5,5,6,2,9,11,5,6,2,.0009967676596716046,.5223492980003357,.4003424048423767,0,2,9,14,2,3,-1,9,15,2,1,3,.00802841316908598,.4959106147289276,.7212964296340942,0,2,5,4,2,3,-1,5,5,2,1,3,.0008602585876360536,.4444884061813355,.55384761095047,0,3,12,2,4,10,-1,14,2,2,5,2,12,7,2,5,2,.0009319150121882558,.539837121963501,.4163244068622589,0,2,6,4,7,3,-1,6,5,7,1,3,-.002508206060156226,.5854265093803406,.456250011920929,0,3,2,0,18,2,-1,11,0,9,1,2,2,1,9,1,2,-.0021378761157393456,.4608069062232971,.5280259251594543,0,3,0,0,18,2,-1,0,0,9,1,2,9,1,9,1,2,-.002154604997485876,.3791126906871796,.5255997180938721,0,3,13,13,4,6,-1,15,13,2,3,2,13,16,2,3,2,-.007621400989592075,.5998609066009521,.4952073991298676,0,3,3,13,4,6,-1,3,13,2,3,2,5,16,2,3,2,.002205536002293229,.4484206140041351,.5588530898094177,0,2,10,12,2,6,-1,10,15,2,3,2,.0012586950324475765,.5450747013092041,.4423840939998627,0,3,5,9,10,10,-1,5,9,5,5,2,10,14,5,5,2,-.005092672072350979,.4118275046348572,.5263035893440247,0,3,11,4,4,2,-1,13,4,2,1,2,11,5,2,1,2,-.0025095739401876926,.5787907838821411,.4998494982719421,0,2,7,12,6,8,-1,10,12,3,8,2,-.0773275569081306,.8397865891456604,.481112003326416,0,3,12,2,4,10,-1,14,2,2,5,2,12,7,2,5,2,-.041485819965601,.240861102938652,.5176993012428284,0,2,8,11,2,1,-1,9,11,1,1,2,.00010355669655837119,.4355360865592957,.5417054295539856,0,2,10,5,1,12,-1,10,9,1,4,3,.0013255809899419546,.5453971028327942,.4894095063209534,0,2,0,11,6,9,-1,3,11,3,9,2,-.00805987324565649,.5771024227142334,.4577918946743012,0,3,12,2,4,10,-1,14,2,2,5,2,12,7,2,5,2,.019058620557189,.5169867873191833,.3400475084781647,0,3,4,2,4,10,-1,4,2,2,5,2,6,7,2,5,2,-.0350578911602497,.2203243970870972,.5000503063201904,0,3,11,4,4,2,-1,13,4,2,1,2,11,5,2,1,2,.005729605909436941,.5043408274650574,.6597570776939392,0,2,0,14,6,3,-1,0,15,6,1,3,-.0116483299061656,.2186284959316254,.4996652901172638,0,3,11,4,4,2,-1,13,4,2,1,2,11,5,2,1,2,.0014544479781761765,.5007681846618652,.5503727793693542,0,2,6,1,3,2,-1,7,1,1,2,3,-.00025030909455381334,.4129841029644013,.524167001247406,0,3,11,4,4,2,-1,13,4,2,1,2,11,5,2,1,2,-.000829072727356106,.541286826133728,.4974496066570282,0,3,5,4,4,2,-1,5,4,2,1,2,7,5,2,1,2,.0010862209601327777,.460552990436554,.5879228711128235,0,3,13,0,2,12,-1,14,0,1,6,2,13,6,1,6,2,.0002000050008064136,.5278854966163635,.4705209136009216,0,2,6,0,3,10,-1,7,0,1,10,3,.0029212920926511288,.5129609704017639,.375553697347641,0,2,3,0,17,8,-1,3,4,17,4,2,.0253874007612467,.4822691977024078,.5790768265724182,0,2,0,4,20,4,-1,0,6,20,2,2,-.00319684692658484,.5248395204544067,.3962840139865875,90.25334930419922,182,0,2,0,3,8,2,-1,4,3,4,2,2,.005803173873573542,.3498983979225159,.596198320388794,0,2,8,11,4,3,-1,8,12,4,1,3,-.009000306949019432,.6816636919975281,.4478552043437958,0,3,5,7,6,4,-1,5,7,3,2,2,8,9,3,2,2,-.00115496595390141,.5585706233978271,.3578251004219055,0,2,8,3,4,9,-1,8,6,4,3,3,-.0011069850297644734,.5365036129951477,.3050428032875061,0,2,8,15,1,4,-1,8,17,1,2,2,.00010308309720130637,.363909512758255,.5344635844230652,0,2,4,5,12,7,-1,8,5,4,7,3,-.005098483990877867,.2859157025814056,.5504264831542969,0,3,4,2,4,10,-1,4,2,2,5,2,6,7,2,5,2,.0008257220033556223,.5236523747444153,.3476041853427887,0,2,3,0,17,2,-1,3,1,17,1,2,.009978332556784153,.4750322103500366,.621964693069458,0,2,2,2,16,15,-1,2,7,16,5,3,-.0374025292694569,.334337592124939,.527806282043457,0,2,15,2,5,2,-1,15,3,5,1,2,.0048548257909715176,.5192180871963501,.3700444102287293,0,2,9,3,2,2,-1,10,3,1,2,2,-.001866447040811181,.2929843962192535,.5091944932937622,0,2,4,5,16,15,-1,4,10,16,5,3,.0168888904154301,.3686845898628235,.5431225895881653,0,2,7,13,5,6,-1,7,16,5,3,2,-.005837262142449617,.3632183969020844,.5221335887908936,0,2,10,7,3,2,-1,11,7,1,2,3,-.00147137395106256,.5870683789253235,.4700650870800018,0,2,8,3,3,1,-1,9,3,1,1,3,-.0011522950371727347,.3195894956588745,.5140954256057739,0,2,9,16,3,3,-1,9,17,3,1,3,-.004256030078977346,.6301859021186829,.4814921021461487,0,2,0,2,5,2,-1,0,3,5,1,2,-.006737829186022282,.1977048069238663,.5025808215141296,0,2,12,5,4,3,-1,12,6,4,1,3,.0113826701417565,.495413213968277,.6867045760154724,0,2,1,7,12,1,-1,5,7,4,1,3,.005179470870643854,.5164427757263184,.3350647985935211,0,2,7,5,6,14,-1,7,12,6,7,2,-.1174378991127014,.2315246015787125,.5234413743019104,0,3,0,0,8,10,-1,0,0,4,5,2,4,5,4,5,2,.0287034492939711,.4664297103881836,.6722521185874939,0,2,9,1,3,2,-1,10,1,1,2,3,.004823103081434965,.5220875144004822,.2723532915115356,0,2,8,1,3,2,-1,9,1,1,2,3,.0026798530016094446,.5079277157783508,.2906948924064636,0,2,12,4,3,3,-1,12,5,3,1,3,.008050408214330673,.4885950982570648,.6395021080970764,0,2,7,4,6,16,-1,7,12,6,8,2,.004805495962500572,.5197256803512573,.365666389465332,0,2,12,4,3,3,-1,12,5,3,1,3,-.0022420159075409174,.6153467893600464,.4763701856136322,0,2,2,3,2,6,-1,2,5,2,2,3,-.0137577103450894,.2637344896793366,.5030903220176697,0,2,14,2,6,9,-1,14,5,6,3,3,-.1033829972147942,.2287521958351135,.5182461142539978,0,2,5,4,3,3,-1,5,5,3,1,3,-.009443208575248718,.6953303813934326,.4694949090480804,0,2,9,17,3,2,-1,10,17,1,2,3,.0008027118165045977,.5450655221939087,.4268783926963806,0,2,5,5,2,3,-1,5,6,2,1,3,-.004194566980004311,.6091387867927551,.4571642875671387,0,2,13,11,3,6,-1,13,13,3,2,3,.0109422104433179,.5241063237190247,.3284547030925751,0,2,3,14,2,6,-1,3,17,2,3,2,-.0005784106906503439,.5387929081916809,.4179368913173676,0,2,14,3,6,2,-1,14,4,6,1,2,-.002088862005621195,.4292691051959992,.5301715731620789,0,2,0,8,16,2,-1,0,9,16,1,2,.0032383969519287348,.379234790802002,.5220744013786316,0,2,14,3,6,2,-1,14,4,6,1,2,.004907502792775631,.5237283110618591,.4126757979393005,0,2,0,0,5,6,-1,0,2,5,2,3,-.0322779417037964,.1947655975818634,.4994502067565918,0,2,12,5,4,3,-1,12,6,4,1,3,-.008971123024821281,.6011285185813904,.4929032027721405,0,2,4,11,3,6,-1,4,13,3,2,3,.0153210898861289,.5009753704071045,.2039822041988373,0,2,12,5,4,3,-1,12,6,4,1,3,.002085556974634528,.4862189888954163,.5721694827079773,0,2,9,5,1,3,-1,9,6,1,1,3,.005061502102762461,.5000218749046326,.1801805943250656,0,2,12,5,4,3,-1,12,6,4,1,3,-.0037174751050770283,.5530117154121399,.4897592961788178,0,2,6,6,8,12,-1,6,12,8,6,2,-.0121705001220107,.4178605973720551,.5383723974227905,0,2,12,5,4,3,-1,12,6,4,1,3,.004624839872121811,.4997169971466065,.5761327147483826,0,2,5,12,9,2,-1,8,12,3,2,3,-.0002104042941937223,.5331807136535645,.4097681045532227,0,2,12,5,4,3,-1,12,6,4,1,3,-.0146417804062366,.5755925178527832,.5051776170730591,0,2,4,5,4,3,-1,4,6,4,1,3,.00331994891166687,.4576976895332336,.6031805872917175,0,2,6,6,9,2,-1,9,6,3,2,3,.003723687957972288,.4380396902561188,.541588306427002,0,2,4,11,1,3,-1,4,12,1,1,3,.0008295116131193936,.5163031816482544,.3702219128608704,0,2,14,12,6,6,-1,14,12,3,6,2,-.0114084901288152,.6072946786880493,.4862565100193024,0,2,7,0,3,7,-1,8,0,1,7,3,-.004532012157142162,.3292475938796997,.5088962912559509,0,2,9,8,3,3,-1,10,8,1,3,3,.00512760179117322,.4829767942428589,.6122708916664124,0,2,8,8,3,3,-1,9,8,1,3,3,.00985831581056118,.4660679996013641,.6556177139282227,0,2,5,10,11,3,-1,5,11,11,1,3,.036985918879509,.5204849243164062,.1690472066402435,0,2,5,7,10,1,-1,10,7,5,1,2,.004649116192013025,.5167322158813477,.3725225031375885,0,2,9,7,3,2,-1,10,7,1,2,3,-.004266470205038786,.6406493186950684,.4987342953681946,0,2,8,7,3,2,-1,9,7,1,2,3,-.0004795659042429179,.5897293090820312,.4464873969554901,0,2,11,9,4,2,-1,11,9,2,2,2,.0036827160511165857,.5441560745239258,.347266286611557,0,2,5,9,4,2,-1,7,9,2,2,2,-.0100598800927401,.2143162935972214,.500482976436615,0,2,14,10,2,4,-1,14,12,2,2,2,-.0003036184061784297,.538642406463623,.4590323865413666,0,2,7,7,3,2,-1,8,7,1,2,3,-.0014545479789376259,.5751184225082397,.4497095048427582,0,2,14,17,6,3,-1,14,18,6,1,3,.0016515209572389722,.5421937704086304,.4238520860671997,0,3,4,5,12,12,-1,4,5,6,6,2,10,11,6,6,2,-.007846863940358162,.4077920913696289,.5258157253265381,0,3,6,9,8,8,-1,10,9,4,4,2,6,13,4,4,2,-.005125985015183687,.422927588224411,.5479453206062317,0,2,0,4,15,4,-1,5,4,5,4,3,-.0368909612298012,.6596375703811646,.4674678146839142,0,2,13,2,4,1,-1,13,2,2,1,2,.0002403563994448632,.4251135885715485,.5573202967643738,0,2,4,12,2,2,-1,4,13,2,1,2,-15150169929256663e-21,.5259246826171875,.4074114859104157,0,2,8,13,4,3,-1,8,14,4,1,3,.0022108471021056175,.4671722948551178,.5886352062225342,0,2,9,13,2,3,-1,9,14,2,1,3,-.0011568620102480054,.5711066126823425,.4487161934375763,0,2,13,11,2,3,-1,13,12,2,1,3,.004999629221856594,.5264198184013367,.2898327112197876,0,3,7,12,4,4,-1,7,12,2,2,2,9,14,2,2,2,-.0014656189596280456,.3891738057136536,.5197871923446655,0,3,10,11,2,2,-1,11,11,1,1,2,10,12,1,1,2,-.0011975039960816503,.5795872807502747,.4927955865859985,0,2,8,17,3,2,-1,9,17,1,2,3,-.0044954330660402775,.2377603054046631,.5012555122375488,0,3,10,11,2,2,-1,11,11,1,1,2,10,12,1,1,2,.00014997160178609192,.4876626133918762,.5617607831954956,0,2,0,17,6,3,-1,0,18,6,1,3,.002639150945469737,.516808807849884,.3765509128570557,0,3,10,11,2,2,-1,11,11,1,1,2,10,12,1,1,2,-.0002936813107226044,.5446649193763733,.4874630868434906,0,3,8,11,2,2,-1,8,11,1,1,2,9,12,1,1,2,.0014211760135367513,.4687897861003876,.669133186340332,0,2,12,5,8,4,-1,12,5,4,4,2,.0794276371598244,.5193443894386292,.273294597864151,0,2,0,5,8,4,-1,4,5,4,4,2,.0799375027418137,.4971731007099152,.1782083958387375,0,2,13,2,4,1,-1,13,2,2,1,2,.0110892597585917,.5165994763374329,.3209475874900818,0,2,3,2,4,1,-1,5,2,2,1,2,.00016560709627810866,.4058471918106079,.5307276248931885,0,3,10,0,4,2,-1,12,0,2,1,2,10,1,2,1,2,-.0053354292176663876,.3445056974887848,.5158129930496216,0,2,7,12,3,1,-1,8,12,1,1,3,.0011287260567769408,.4594863057136536,.6075533032417297,0,3,8,11,4,8,-1,10,11,2,4,2,8,15,2,4,2,-.0219692196696997,.1680400967597961,.5228595733642578,0,2,9,9,2,2,-1,9,10,2,1,2,-.00021775320055894554,.3861596882343292,.5215672850608826,0,2,3,18,15,2,-1,3,19,15,1,2,.00020200149447191507,.5517979264259338,.4363039135932922,0,3,2,6,2,12,-1,2,6,1,6,2,3,12,1,6,2,-.0217331498861313,.7999460101127625,.4789851009845734,0,2,9,8,2,3,-1,9,9,2,1,3,-.0008439993252977729,.4085975885391235,.5374773144721985,0,2,7,10,3,2,-1,8,10,1,2,3,-.00043895249837078154,.5470405220985413,.4366143047809601,0,2,11,11,3,1,-1,12,11,1,1,3,.0015092400135472417,.4988996982574463,.5842149257659912,0,2,6,11,3,1,-1,7,11,1,1,3,-.003554783994331956,.6753690242767334,.4721005856990814,0,3,9,2,4,2,-1,11,2,2,1,2,9,3,2,1,2,.00048191400128416717,.541585385799408,.4357109069824219,0,2,4,12,2,3,-1,4,13,2,1,3,-.00602643983438611,.2258509993553162,.499188095331192,0,2,2,1,18,3,-1,8,1,6,3,3,-.0116681400686502,.625655472278595,.4927498996257782,0,2,5,1,4,14,-1,7,1,2,14,2,-.0028718370012938976,.3947784900665283,.524580180644989,0,2,8,16,12,3,-1,8,16,6,3,2,.0170511696487665,.4752511084079742,.5794224143028259,0,2,1,17,18,3,-1,7,17,6,3,3,-.0133520802482963,.6041104793548584,.4544535875320435,0,2,9,14,2,6,-1,9,17,2,3,2,-.0003930180100724101,.4258275926113129,.5544905066490173,0,2,9,12,1,8,-1,9,16,1,4,2,.0030483349692076445,.5233420133590698,.3780272901058197,0,2,9,14,2,3,-1,9,15,2,1,3,-.00435792887583375,.6371889114379883,.4838674068450928,0,2,9,6,2,12,-1,9,10,2,4,3,.0056661018170416355,.5374705791473389,.4163666069507599,0,2,12,9,3,3,-1,12,10,3,1,3,6067733920644969e-20,.4638795852661133,.5311625003814697,0,2,0,1,4,8,-1,2,1,2,8,2,.0367381609976292,.4688656032085419,.6466524004936218,0,3,9,1,6,2,-1,12,1,3,1,2,9,2,3,1,2,.008652813732624054,.5204318761825562,.2188657969236374,0,2,1,3,12,14,-1,1,10,12,7,2,-.1537135988473892,.1630371958017349,.4958840012550354,0,3,8,12,4,2,-1,10,12,2,1,2,8,13,2,1,2,-.00041560421232134104,.577445924282074,.4696458876132965,0,3,1,9,10,2,-1,1,9,5,1,2,6,10,5,1,2,-.0012640169588848948,.3977175951004028,.5217198133468628,0,2,8,15,4,3,-1,8,16,4,1,3,-.003547334112226963,.6046528220176697,.480831503868103,0,2,6,8,8,3,-1,6,9,8,1,3,3001906952704303e-20,.3996723890304565,.5228201150894165,0,2,9,15,5,3,-1,9,16,5,1,3,.00131130195222795,.4712158143520355,.5765997767448425,0,2,8,7,4,3,-1,8,8,4,1,3,-.0013374709524214268,.4109584987163544,.5253170132637024,0,2,7,7,6,2,-1,7,8,6,1,2,.0208767093718052,.5202993750572205,.1757981926202774,0,3,5,7,8,2,-1,5,7,4,1,2,9,8,4,1,2,-.007549794856458902,.6566609740257263,.4694975018501282,0,2,12,9,3,3,-1,12,10,3,1,3,.0241885501891375,.5128673911094666,.3370220959186554,0,2,4,7,4,2,-1,4,8,4,1,2,-.002935882890596986,.658078670501709,.4694541096687317,0,2,14,2,6,9,-1,14,5,6,3,3,.0575579293072224,.5146445035934448,.2775259912014008,0,2,4,9,3,3,-1,5,9,1,3,3,-.0011343370424583554,.3836601972579956,.5192667245864868,0,2,12,9,3,3,-1,12,10,3,1,3,.0168169997632504,.5085592865943909,.6177260875701904,0,2,0,2,6,9,-1,0,5,6,3,3,.005053517874330282,.5138763189315796,.3684791922569275,0,2,17,3,3,6,-1,18,3,1,6,3,-.004587471019476652,.5989655256271362,.4835202097892761,0,2,0,3,3,6,-1,1,3,1,6,3,.001688246033154428,.4509486854076386,.5723056793212891,0,2,17,14,1,2,-1,17,15,1,1,2,-.0016554000321775675,.3496770858764648,.5243319272994995,0,2,4,9,4,3,-1,6,9,2,3,2,-.0193738006055355,.1120536997914314,.496871292591095,0,2,12,9,3,3,-1,12,10,3,1,3,.0103744501248002,.5148196816444397,.4395213127136231,0,2,5,9,3,3,-1,5,10,3,1,3,.00014973050565458834,.4084999859333038,.526988685131073,0,3,9,5,6,8,-1,12,5,3,4,2,9,9,3,4,2,-.042981930077076,.6394104957580566,.501850426197052,0,3,5,5,6,8,-1,5,5,3,4,2,8,9,3,4,2,.008306593634188175,.470755398273468,.6698353290557861,0,2,16,1,4,6,-1,16,4,4,3,2,-.0041285790503025055,.4541369080543518,.5323647260665894,0,2,1,0,6,20,-1,3,0,2,20,3,.0017399420030415058,.433396190404892,.5439866185188293,0,2,12,11,3,2,-1,13,11,1,2,3,.00011739750334527344,.4579687118530273,.5543426275253296,0,2,5,11,3,2,-1,6,11,1,2,3,.00018585780344437808,.4324643909931183,.5426754951477051,0,2,9,4,6,1,-1,11,4,2,1,3,.005558769218623638,.525722086429596,.3550611138343811,0,2,0,0,8,3,-1,4,0,4,3,2,-.007985156029462814,.6043018102645874,.4630635976791382,0,2,15,0,2,5,-1,15,0,1,5,2,.0006059412262402475,.4598254859447479,.55331951379776,0,2,4,1,3,2,-1,5,1,1,2,3,-.0002298304025316611,.4130752086639404,.5322461128234863,0,2,7,0,6,15,-1,9,0,2,15,3,.0004374021082185209,.4043039977550507,.5409289002418518,0,2,6,11,3,1,-1,7,11,1,1,3,.0002948202018160373,.4494963884353638,.5628852248191833,0,2,12,0,3,4,-1,13,0,1,4,3,.0103126596659422,.5177510976791382,.2704316973686218,0,2,5,4,6,1,-1,7,4,2,1,3,-.007724110968410969,.1988019049167633,.4980553984642029,0,2,12,7,3,2,-1,12,8,3,1,2,-.004679720848798752,.6644750237464905,.5018296241760254,0,2,0,1,4,6,-1,0,4,4,3,2,-.005075545981526375,.3898304998874664,.5185269117355347,0,2,12,7,3,2,-1,12,8,3,1,2,.00224797404371202,.4801808893680573,.5660336017608643,0,2,2,16,3,3,-1,2,17,3,1,3,.0008332700817845762,.5210919976234436,.3957188129425049,0,3,13,8,6,10,-1,16,8,3,5,2,13,13,3,5,2,-.0412793308496475,.6154541969299316,.5007054209709167,0,2,0,9,5,2,-1,0,10,5,1,2,-.0005093018990010023,.3975942134857178,.5228403806686401,0,3,12,11,2,2,-1,13,11,1,1,2,12,12,1,1,2,.0012568780221045017,.4979138076305389,.5939183235168457,0,2,3,15,3,3,-1,3,16,3,1,3,.008004849776625633,.4984497129917145,.1633366048336029,0,2,12,7,3,2,-1,12,8,3,1,2,-.0011879300000146031,.5904964804649353,.4942624866962433,0,2,5,7,3,2,-1,5,8,3,1,2,.0006194895249791443,.4199557900428772,.5328726172447205,0,2,9,5,9,9,-1,9,8,9,3,3,.006682985927909613,.5418602824211121,.490588903427124,0,2,5,0,3,7,-1,6,0,1,7,3,-.0037062340416014194,.3725939095020294,.5138000249862671,0,2,5,2,12,5,-1,9,2,4,5,3,-.0397394113242626,.6478961110115051,.5050346851348877,0,3,6,11,2,2,-1,6,11,1,1,2,7,12,1,1,2,.0014085009461268783,.4682339131832123,.6377884149551392,0,2,15,15,3,2,-1,15,16,3,1,2,.0003932268882635981,.5458530187606812,.415048211812973,0,2,2,15,3,2,-1,2,16,3,1,2,-.0018979819724336267,.3690159916877747,.5149704217910767,0,3,14,12,6,8,-1,17,12,3,4,2,14,16,3,4,2,-.0139704402536154,.6050562858581543,.4811357855796814,0,2,2,8,15,6,-1,7,8,5,6,3,-.1010081991553307,.2017080038785934,.4992361962795258,0,2,2,2,18,17,-1,8,2,6,17,3,-.0173469204455614,.5713148713111877,.4899486005306244,0,2,5,1,4,1,-1,7,1,2,1,2,.000156197595060803,.4215388894081116,.5392642021179199,0,2,5,2,12,5,-1,9,2,4,5,3,.1343892961740494,.5136151909828186,.3767612874507904,0,2,3,2,12,5,-1,7,2,4,5,3,-.0245822407305241,.7027357816696167,.4747906923294067,0,3,4,9,12,4,-1,10,9,6,2,2,4,11,6,2,2,-.0038553720805794,.4317409098148346,.5427716970443726,0,3,5,15,6,2,-1,5,15,3,1,2,8,16,3,1,2,-.002316524973139167,.594269871711731,.4618647992610931,0,2,10,14,2,3,-1,10,15,2,1,3,-.004851812031120062,.6191568970680237,.4884895086288452,0,3,0,13,20,2,-1,0,13,10,1,2,10,14,10,1,2,.002469993894919753,.5256664752960205,.4017199873924255,0,3,4,9,12,8,-1,10,9,6,4,2,4,13,6,4,2,.0454969592392445,.5237867832183838,.2685773968696594,0,2,8,13,3,6,-1,8,16,3,3,2,-.0203195996582508,.213044598698616,.4979738891124725,0,2,10,12,2,2,-1,10,13,2,1,2,.0002699499891605228,.481404185295105,.5543122291564941,0,3,9,12,2,2,-1,9,12,1,1,2,10,13,1,1,2,-.0018232699949294329,.6482579708099365,.4709989130496979,0,3,4,11,14,4,-1,11,11,7,2,2,4,13,7,2,2,-.006301579065620899,.4581927955150604,.5306236147880554,0,2,8,5,4,2,-1,8,6,4,1,2,-.0002413949987385422,.5232086777687073,.4051763117313385,0,2,10,10,6,3,-1,12,10,2,3,3,-.001033036969602108,.5556201934814453,.4789193868637085,0,2,2,14,1,2,-1,2,15,1,1,2,.0001804116036510095,.5229442715644836,.4011810123920441,0,3,13,8,6,12,-1,16,8,3,6,2,13,14,3,6,2,-.0614078603684902,.62986820936203,.5010703206062317,0,3,1,8,6,12,-1,1,8,3,6,2,4,14,3,6,2,-.0695439130067825,.7228280901908875,.4773184061050415,0,2,10,0,6,10,-1,12,0,2,10,3,-.0705426633358002,.2269513010978699,.5182529091835022,0,3,5,11,8,4,-1,5,11,4,2,2,9,13,4,2,2,.0024423799477517605,.5237097144126892,.4098151028156281,0,3,10,16,8,4,-1,14,16,4,2,2,10,18,4,2,2,.0015494349645450711,.4773750901222229,.5468043088912964,0,2,7,7,6,6,-1,9,7,2,6,3,-.0239142198115587,.7146975994110107,.4783824980258942,0,2,10,2,4,10,-1,10,2,2,10,2,-.0124536901712418,.2635296881198883,.5241122841835022,0,2,6,1,4,9,-1,8,1,2,9,2,-.00020760179904755205,.3623757064342499,.5113608837127686,0,2,12,19,2,1,-1,12,19,1,1,2,29781080229440704e-21,.4705932140350342,.5432801842689514,104.74919891357422,211,0,2,1,2,4,9,-1,3,2,2,9,2,.0117727499455214,.3860518932342529,.6421167254447937,0,2,7,5,6,4,-1,9,5,2,4,3,.0270375702530146,.4385654926300049,.675403892993927,0,2,9,4,2,4,-1,9,6,2,2,2,-3641950024757534e-20,.5487101078033447,.34233158826828,0,2,14,5,2,8,-1,14,9,2,4,2,.001999540952965617,.3230532109737396,.5400317907333374,0,2,7,6,5,12,-1,7,12,5,6,2,.0045278300531208515,.5091639757156372,.2935043871402741,0,2,14,6,2,6,-1,14,9,2,3,2,.00047890920541249216,.4178153872489929,.5344064235687256,0,2,4,6,2,6,-1,4,9,2,3,2,.0011720920447260141,.2899182140827179,.5132070779800415,0,3,8,15,10,4,-1,13,15,5,2,2,8,17,5,2,2,.0009530570241622627,.428012490272522,.5560845136642456,0,2,6,18,2,2,-1,7,18,1,2,2,15099150004971307e-21,.4044871926307678,.5404760241508484,0,2,11,3,6,2,-1,11,4,6,1,2,-.0006081790197640657,.4271768927574158,.5503466129302979,0,2,2,0,16,6,-1,2,2,16,2,3,.003322452073916793,.3962723910808563,.5369734764099121,0,2,11,3,6,2,-1,11,4,6,1,2,-.0011037490330636501,.4727177917957306,.5237749814987183,0,2,4,11,10,3,-1,4,12,10,1,3,-.0014350269921123981,.5603008270263672,.4223509132862091,0,2,11,3,6,2,-1,11,4,6,1,2,.0020767399109899998,.5225917100906372,.4732725918292999,0,2,3,3,6,2,-1,3,4,6,1,2,-.00016412809782195836,.3999075889587402,.5432739853858948,0,2,16,0,4,7,-1,16,0,2,7,2,.008830243721604347,.4678385853767395,.6027327179908752,0,2,0,14,9,6,-1,0,16,9,2,3,-.0105520701035857,.3493967056274414,.5213974714279175,0,2,9,16,3,3,-1,9,17,3,1,3,-.00227316003292799,.6185818910598755,.4749062955379486,0,2,4,6,6,2,-1,6,6,2,2,3,-.0008478633244521916,.5285341143608093,.3843482136726379,0,2,15,11,1,3,-1,15,12,1,1,3,.0012081359745934606,.536064088344574,.3447335958480835,0,2,5,5,2,3,-1,5,6,2,1,3,.002651273040100932,.4558292031288147,.6193962097167969,0,2,10,9,2,2,-1,10,10,2,1,2,-.0011012479662895203,.368023008108139,.5327628254890442,0,2,3,1,4,3,-1,5,1,2,3,2,.0004956151824444532,.396059513092041,.5274940729141235,0,2,16,0,4,7,-1,16,0,2,7,2,-.0439017713069916,.7020444869995117,.4992839097976685,0,2,0,0,20,1,-1,10,0,10,1,2,.0346903502941132,.5049164295196533,.276660293340683,0,2,15,11,1,3,-1,15,12,1,1,3,-.002744219033047557,.2672632932662964,.5274971127510071,0,2,0,4,3,4,-1,1,4,1,4,3,.003331658896058798,.4579482972621918,.6001101732254028,0,2,16,3,3,6,-1,16,5,3,2,3,-.0200445707887411,.3171594142913818,.523571789264679,0,2,1,3,3,6,-1,1,5,3,2,3,.0013492030557245016,.5265362858772278,.4034324884414673,0,3,6,2,12,6,-1,12,2,6,3,2,6,5,6,3,2,.0029702018946409225,.5332456827163696,.4571984112262726,0,2,8,10,4,3,-1,8,11,4,1,3,.006303998176008463,.4593310952186585,.6034635901451111,0,3,4,2,14,6,-1,11,2,7,3,2,4,5,7,3,2,-.0129365902394056,.4437963962554932,.5372971296310425,0,2,9,11,2,3,-1,9,12,2,1,3,.004014872945845127,.4680323898792267,.6437833905220032,0,2,15,13,2,3,-1,15,14,2,1,3,-.002640167949721217,.3709631860256195,.5314332842826843,0,2,8,12,4,3,-1,8,13,4,1,3,.0139184398576617,.4723555147647858,.713080883026123,0,2,15,11,1,3,-1,15,12,1,1,3,-.00045087869511917233,.4492394030094147,.5370404124259949,0,2,7,13,5,2,-1,7,14,5,1,2,.00025384349282830954,.4406864047050476,.5514402985572815,0,2,7,12,6,3,-1,7,13,6,1,3,.002271000063046813,.4682416915893555,.5967984199523926,0,2,5,11,4,4,-1,5,13,4,2,2,.002412077970802784,.5079392194747925,.3018598854541779,0,2,11,4,3,3,-1,12,4,1,3,3,-3602567085181363e-20,.560103714466095,.4471096992492676,0,2,6,4,3,3,-1,7,4,1,3,3,-.0074905529618263245,.2207535058259964,.4989944100379944,0,2,16,5,3,6,-1,17,5,1,6,3,-.017513120546937,.6531215906143188,.5017648935317993,0,2,3,6,12,7,-1,7,6,4,7,3,.1428163051605225,.4967963099479675,.1482062041759491,0,2,16,5,3,6,-1,17,5,1,6,3,.005534526892006397,.4898946881294251,.5954223871231079,0,2,3,13,2,3,-1,3,14,2,1,3,-.0009632359142415226,.3927116990089417,.519607424736023,0,2,16,5,3,6,-1,17,5,1,6,3,-.0020370010752230883,.5613325238227844,.4884858131408691,0,2,1,5,3,6,-1,2,5,1,6,3,.0016614829655736685,.4472880065441132,.5578880906105042,0,2,1,9,18,1,-1,7,9,6,1,3,-.0031188090797513723,.3840532898902893,.5397477746009827,0,2,0,9,8,7,-1,4,9,4,7,2,-.006400061771273613,.5843983888626099,.4533218145370483,0,2,12,11,8,2,-1,12,12,8,1,2,.0003131960111204535,.5439221858978271,.4234727919101715,0,2,0,11,8,2,-1,0,12,8,1,2,-.0182220991700888,.1288464963436127,.4958404898643494,0,2,9,13,2,3,-1,9,14,2,1,3,.008796924725174904,.49512979388237,.7153480052947998,0,3,4,10,12,4,-1,4,10,6,2,2,10,12,6,2,2,-.004239507019519806,.3946599960327148,.5194936990737915,0,2,9,3,3,7,-1,10,3,1,7,3,.009708627127110958,.4897503852844238,.6064900159835815,0,2,7,2,3,5,-1,8,2,1,5,3,-.003993417136371136,.3245440125465393,.5060828924179077,0,3,9,12,4,6,-1,11,12,2,3,2,9,15,2,3,2,-.0167850591242313,.1581953018903732,.5203778743743896,0,2,8,7,3,6,-1,9,7,1,6,3,.018272090703249,.4680935144424439,.6626979112625122,0,2,15,4,4,2,-1,15,5,4,1,2,.00568728381767869,.5211697816848755,.3512184917926788,0,2,8,7,3,3,-1,9,7,1,3,3,-.0010739039862528443,.5768386125564575,.4529845118522644,0,2,14,2,6,4,-1,14,4,6,2,2,-.00370938703417778,.4507763087749481,.5313581228256226,0,2,7,16,6,1,-1,9,16,2,1,3,-.0002111070934915915,.5460820198059082,.4333376884460449,0,2,15,13,2,3,-1,15,14,2,1,3,.0010670139454305172,.5371856093406677,.4078390896320343,0,2,8,7,3,10,-1,9,7,1,10,3,.0035943021066486835,.4471287131309509,.5643836259841919,0,2,11,10,2,6,-1,11,12,2,2,3,-.005177603103220463,.4499393105506897,.5280330181121826,0,2,6,10,4,1,-1,8,10,2,1,2,-.00025414369883947074,.5516173243522644,.4407708048820496,0,2,10,9,2,2,-1,10,10,2,1,2,.006352256052196026,.5194190144538879,.2465227991342545,0,2,8,9,2,2,-1,8,10,2,1,2,-.00044205080484971404,.3830705881118774,.5139682292938232,0,3,12,7,2,2,-1,13,7,1,1,2,12,8,1,1,2,.0007448872784152627,.4891090989112854,.5974786877632141,0,3,5,7,2,2,-1,5,7,1,1,2,6,8,1,1,2,-.0035116379149258137,.7413681745529175,.4768764972686768,0,2,13,0,3,14,-1,14,0,1,14,3,-.0125409103929996,.3648819029331207,.5252826809883118,0,2,4,0,3,14,-1,5,0,1,14,3,.009493185207247734,.5100492835044861,.362958699464798,0,2,13,4,3,14,-1,14,4,1,14,3,.0129611501470208,.5232442021369934,.4333561062812805,0,2,9,14,2,3,-1,9,15,2,1,3,.004720944911241531,.4648149013519287,.6331052780151367,0,2,8,14,4,3,-1,8,15,4,1,3,-.0023119079414755106,.5930309891700745,.4531058073043823,0,2,4,2,3,16,-1,5,2,1,16,3,-.002826229901984334,.3870477974414825,.5257101058959961,0,2,7,2,8,10,-1,7,7,8,5,2,-.0014311339473351836,.552250325679779,.4561854898929596,0,2,6,14,7,3,-1,6,15,7,1,3,.0019378310535103083,.4546220898628235,.5736966729164124,0,3,9,2,10,12,-1,14,2,5,6,2,9,8,5,6,2,.00026343559147790074,.5345739126205444,.4571875035762787,0,2,6,7,8,2,-1,6,8,8,1,2,.0007825752254575491,.3967815935611725,.5220187902450562,0,2,8,13,4,6,-1,8,16,4,3,2,-.0195504408329725,.282964289188385,.5243508219718933,0,2,6,6,1,3,-1,6,7,1,1,3,.00043914958951063454,.4590066969394684,.589909017086029,0,2,16,2,4,6,-1,16,4,4,2,3,.0214520003646612,.523141086101532,.2855378985404968,0,3,6,6,4,2,-1,6,6,2,1,2,8,7,2,1,2,.0005897358059883118,.4397256970405579,.550642192363739,0,2,16,2,4,6,-1,16,4,4,2,3,-.0261576101183891,.3135079145431519,.5189175009727478,0,2,0,2,4,6,-1,0,4,4,2,3,-.0139598604291677,.3213272988796234,.5040717720985413,0,2,9,6,2,6,-1,9,6,1,6,2,-.006369901821017265,.6387544870376587,.4849506914615631,0,2,3,4,6,10,-1,3,9,6,5,2,-.008561382070183754,.2759132087230682,.5032019019126892,0,2,9,5,2,6,-1,9,5,1,6,2,.000966229010373354,.4685640931129456,.5834879279136658,0,2,3,13,2,3,-1,3,14,2,1,3,.0007655026856809855,.5175207257270813,.389642208814621,0,2,13,13,3,2,-1,13,14,3,1,2,-.008183334022760391,.2069136947393417,.5208122134208679,0,3,2,16,10,4,-1,2,16,5,2,2,7,18,5,2,2,-.009397693909704685,.6134091019630432,.4641222953796387,0,3,5,6,10,6,-1,10,6,5,3,2,5,9,5,3,2,.004802898038178682,.5454108119010925,.439521998167038,0,2,7,14,1,3,-1,7,15,1,1,3,-.003568056970834732,.6344485282897949,.4681093990802765,0,2,14,16,6,3,-1,14,17,6,1,3,.0040733120404183865,.5292683243751526,.4015620052814484,0,2,5,4,3,3,-1,5,5,3,1,3,.0012568129459396005,.4392988085746765,.5452824831008911,0,2,7,4,10,3,-1,7,5,10,1,3,-.0029065010603517294,.5898832082748413,.4863379895687103,0,2,0,4,5,4,-1,0,6,5,2,2,-.00244093406945467,.4069364964962006,.5247421860694885,0,2,13,11,3,9,-1,13,14,3,3,3,.0248307008296251,.5182725787162781,.3682524859905243,0,2,4,11,3,9,-1,4,14,3,3,3,-.0488540083169937,.1307577937841415,.496128112077713,0,2,9,7,2,1,-1,9,7,1,1,2,-.001611037994734943,.6421005725860596,.4872662127017975,0,2,5,0,6,17,-1,7,0,2,17,3,-.0970094799995422,.0477693490684032,.495098888874054,0,2,10,3,6,3,-1,10,3,3,3,2,.0011209240183234215,.4616267085075378,.5354745984077454,0,2,2,2,15,4,-1,7,2,5,4,3,-.001306409016251564,.626185417175293,.4638805985450745,0,3,8,2,8,2,-1,12,2,4,1,2,8,3,4,1,2,.00045771620352752507,.5384417772293091,.4646640121936798,0,2,8,1,3,6,-1,8,3,3,2,3,-.0006314995116554201,.3804047107696533,.51302570104599,0,2,9,17,2,2,-1,9,18,2,1,2,.0001450597046641633,.4554310142993927,.5664461851119995,0,2,0,0,2,14,-1,1,0,1,14,2,-.0164745505899191,.6596958041191101,.4715859889984131,0,2,12,0,7,3,-1,12,1,7,1,3,.0133695797994733,.519546627998352,.3035964965820313,0,2,1,14,1,2,-1,1,15,1,1,2,.00010271780047332868,.522917628288269,.4107066094875336,0,3,14,12,2,8,-1,15,12,1,4,2,14,16,1,4,2,-.0055311559699475765,.6352887749671936,.4960907101631165,0,2,1,0,7,3,-1,1,1,7,1,3,-.0026187049224972725,.3824546039104462,.5140984058380127,0,3,14,12,2,8,-1,15,12,1,4,2,14,16,1,4,2,.005083426833152771,.4950439929962158,.6220818758010864,0,3,6,0,8,12,-1,6,0,4,6,2,10,6,4,6,2,.0798181593418121,.4952335953712463,.1322475969791412,0,2,6,1,8,9,-1,6,4,8,3,3,-.0992265865206718,.7542728781700134,.5008416771888733,0,2,5,2,2,2,-1,5,3,2,1,2,-.0006517401780001819,.3699302971363068,.5130121111869812,0,3,13,14,6,6,-1,16,14,3,3,2,13,17,3,3,2,-.018996849656105,.6689178943634033,.4921202957630158,0,3,0,17,20,2,-1,0,17,10,1,2,10,18,10,1,2,.0173468999564648,.4983300864696503,.1859198063611984,0,3,10,3,2,6,-1,11,3,1,3,2,10,6,1,3,2,.0005508210160769522,.4574424028396606,.5522121787071228,0,2,5,12,6,2,-1,8,12,3,2,2,.002005605027079582,.5131744742393494,.3856469988822937,0,2,10,7,6,13,-1,10,7,3,13,2,-.007768819108605385,.4361700117588043,.5434309244155884,0,2,5,15,10,5,-1,10,15,5,5,2,.0508782789111137,.4682720899581909,.6840639710426331,0,2,10,4,4,10,-1,10,4,2,10,2,-.0022901780903339386,.4329245090484619,.5306099057197571,0,2,5,7,2,1,-1,6,7,1,1,2,-.00015715380141045898,.5370057225227356,.4378164112567902,0,2,10,3,6,7,-1,10,3,3,7,2,.1051924005150795,.5137274265289307,.0673614665865898,0,2,4,3,6,7,-1,7,3,3,7,2,.002719891956076026,.4112060964107513,.5255665183067322,0,2,1,7,18,5,-1,7,7,6,5,3,.0483377799391747,.5404623746871948,.4438967108726502,0,2,3,17,4,3,-1,5,17,2,3,2,.0009570376132614911,.4355969130992889,.5399510860443115,0,3,8,14,12,6,-1,14,14,6,3,2,8,17,6,3,2,-.0253712590783834,.5995175242424011,.5031024813652039,0,3,0,13,20,4,-1,0,13,10,2,2,10,15,10,2,2,.0524579510092735,.4950287938117981,.1398351043462753,0,3,4,5,14,2,-1,11,5,7,1,2,4,6,7,1,2,-.0123656298965216,.639729917049408,.496410608291626,0,3,1,2,10,12,-1,1,2,5,6,2,6,8,5,6,2,-.1458971947431564,.1001669988036156,.494632214307785,0,2,6,1,14,3,-1,6,2,14,1,3,-.0159086007624865,.3312329947948456,.5208340883255005,0,2,8,16,2,3,-1,8,17,2,1,3,.00039486068999394774,.4406363964080811,.5426102876663208,0,2,9,17,3,2,-1,10,17,1,2,3,-.0052454001270234585,.2799589931964874,.5189967155456543,0,3,5,15,4,2,-1,5,15,2,1,2,7,16,2,1,2,-.005042179953306913,.6987580060958862,.4752142131328583,0,2,10,15,1,3,-1,10,16,1,1,3,.0029812189750373363,.4983288943767548,.6307479739189148,0,3,8,16,4,4,-1,8,16,2,2,2,10,18,2,2,2,-.007288430817425251,.298233300447464,.5026869773864746,0,2,6,11,8,6,-1,6,14,8,3,2,.0015094350092113018,.5308442115783691,.3832970857620239,0,2,2,13,5,2,-1,2,14,5,1,2,-.009334079921245575,.2037964016199112,.4969817101955414,0,3,13,14,6,6,-1,16,14,3,3,2,13,17,3,3,2,.0286671407520771,.5025696754455566,.6928027272224426,0,2,1,9,18,4,-1,7,9,6,4,3,.1701968014240265,.4960052967071533,.1476442962884903,0,3,13,14,6,6,-1,16,14,3,3,2,13,17,3,3,2,-.003261447884142399,.5603063702583313,.4826056063175201,0,2,0,2,1,6,-1,0,4,1,2,3,.0005576927796937525,.5205562114715576,.4129633009433746,0,2,5,0,15,20,-1,5,10,15,10,2,.3625833988189697,.5221652984619141,.3768612146377564,0,3,1,14,6,6,-1,1,14,3,3,2,4,17,3,3,2,-.0116151301190257,.6022682785987854,.4637489914894104,0,3,8,14,4,6,-1,10,14,2,3,2,8,17,2,3,2,-.004079519771039486,.4070447087287903,.5337479114532471,0,2,7,11,2,1,-1,8,11,1,1,2,.0005720430053770542,.4601835012435913,.5900393128395081,0,2,9,17,3,2,-1,10,17,1,2,3,.000675433489959687,.5398252010345459,.4345428943634033,0,2,8,17,3,2,-1,9,17,1,2,3,.0006329569732770324,.5201563239097595,.4051358997821808,0,3,12,14,4,6,-1,14,14,2,3,2,12,17,2,3,2,.00124353205319494,.4642387926578522,.5547441244125366,0,3,4,14,4,6,-1,4,14,2,3,2,6,17,2,3,2,-.004736385773867369,.6198567152023315,.4672552049160004,0,3,13,14,2,6,-1,14,14,1,3,2,13,17,1,3,2,-.006465846206992865,.6837332844734192,.5019000768661499,0,3,5,14,2,6,-1,5,14,1,3,2,6,17,1,3,2,.000350173213519156,.4344803094863892,.5363622903823853,0,2,7,0,6,12,-1,7,4,6,4,3,.00015754920605104417,.4760079085826874,.5732020735740662,0,2,0,7,12,2,-1,4,7,4,2,3,.009977436624467373,.5090985894203186,.3635039925575256,0,2,10,3,3,13,-1,11,3,1,13,3,-.0004146452993154526,.5570064783096313,.4593802094459534,0,2,7,3,3,13,-1,8,3,1,13,3,-.00035888899583369493,.5356845855712891,.4339134991168976,0,2,10,8,6,3,-1,10,9,6,1,3,.0004046325047966093,.4439803063869476,.5436776876449585,0,2,3,11,3,2,-1,4,11,1,2,3,-.0008218478760682046,.4042294919490814,.5176299214363098,0,3,13,12,6,8,-1,16,12,3,4,2,13,16,3,4,2,.005946741905063391,.4927651882171631,.5633779764175415,0,2,7,6,6,5,-1,9,6,2,5,3,-.0217533893883228,.8006293773651123,.480084091424942,0,2,17,11,2,7,-1,17,11,1,7,2,-.0145403798669577,.3946054875850678,.5182222723960876,0,2,3,13,8,2,-1,7,13,4,2,2,-.0405107699334621,.0213249903172255,.4935792982578278,0,2,6,9,8,3,-1,6,10,8,1,3,-.0005845826817676425,.4012795984745026,.5314025282859802,0,2,4,3,4,3,-1,4,4,4,1,3,.005515180062502623,.4642418920993805,.5896260738372803,0,2,11,3,4,3,-1,11,4,4,1,3,-.006062622182071209,.6502159237861633,.5016477704048157,0,2,1,4,17,12,-1,1,8,17,4,3,.0945358425378799,.5264708995819092,.4126827120780945,0,2,11,3,4,3,-1,11,4,4,1,3,.004731505177915096,.4879199862480164,.5892447829246521,0,2,4,8,6,3,-1,4,9,6,1,3,-.0005257147131487727,.391728013753891,.5189412832260132,0,2,12,3,5,3,-1,12,4,5,1,3,-.002546404954046011,.5837599039077759,.498570591211319,0,2,1,11,2,7,-1,2,11,1,7,2,-.0260756891220808,.1261983960866928,.4955821931362152,0,3,15,12,2,8,-1,16,12,1,4,2,15,16,1,4,2,-.00547797093167901,.5722513794898987,.5010265707969666,0,2,4,8,11,3,-1,4,9,11,1,3,.005133774131536484,.527326226234436,.4226376116275787,0,3,9,13,6,2,-1,12,13,3,1,2,9,14,3,1,2,.000479449809063226,.4450066983699799,.5819587111473083,0,2,6,13,4,3,-1,6,14,4,1,3,-.0021114079281687737,.5757653117179871,.451171487569809,0,2,9,12,3,3,-1,10,12,1,3,3,-.0131799904629588,.1884381026029587,.5160734057426453,0,2,5,3,3,3,-1,5,4,3,1,3,-.004796809982508421,.6589789986610413,.4736118912696838,0,2,9,4,2,3,-1,9,5,2,1,3,.0067483168095350266,.5259429812431335,.3356395065784454,0,2,0,2,16,3,-1,0,3,16,1,3,.0014623369788751006,.5355271100997925,.4264092147350311,0,3,15,12,2,8,-1,16,12,1,4,2,15,16,1,4,2,.004764515906572342,.5034406781196594,.5786827802658081,0,3,3,12,2,8,-1,3,12,1,4,2,4,16,1,4,2,.0068066660314798355,.475660502910614,.6677829027175903,0,2,14,13,3,6,-1,14,15,3,2,3,.0036608621012419462,.5369611978530884,.4311546981334686,0,2,3,13,3,6,-1,3,15,3,2,3,.0214496403932571,.4968641996383667,.1888816058635712,0,3,6,5,10,2,-1,11,5,5,1,2,6,6,5,1,2,.004167890176177025,.4930733144283295,.5815368890762329,0,2,2,14,14,6,-1,2,17,14,3,2,.008646756410598755,.5205205082893372,.4132595062255859,0,2,10,14,1,3,-1,10,15,1,1,3,-.0003611407882999629,.5483555197715759,.4800927937030792,0,3,4,16,2,2,-1,4,16,1,1,2,5,17,1,1,2,.0010808729566633701,.4689902067184448,.6041421294212341,0,2,10,6,2,3,-1,10,7,2,1,3,.005771995987743139,.5171142220497131,.3053277134895325,0,3,0,17,20,2,-1,0,17,10,1,2,10,18,10,1,2,.001572077046148479,.5219978094100952,.4178803861141205,0,2,13,6,1,3,-1,13,7,1,1,3,-.0019307859474793077,.5860369801521301,.4812920093536377,0,2,8,13,3,2,-1,9,13,1,2,3,-.007892627269029617,.1749276965856552,.497173398733139,0,2,12,2,3,3,-1,13,2,1,3,3,-.002222467912361026,.434258908033371,.521284818649292,0,3,3,18,2,2,-1,3,18,1,1,2,4,19,1,1,2,.0019011989934369922,.4765186905860901,.689205527305603,0,2,9,16,3,4,-1,10,16,1,4,3,.0027576119173318148,.5262191295623779,.4337486028671265,0,2,6,6,1,3,-1,6,7,1,1,3,.005178744904696941,.4804069101810455,.7843729257583618,0,2,13,1,5,2,-1,13,2,5,1,2,-.0009027334162965417,.412084698677063,.5353423953056335,0,3,7,14,6,2,-1,7,14,3,1,2,10,15,3,1,2,.005179795902222395,.4740372896194458,.6425960063934326,0,2,11,3,3,4,-1,12,3,1,4,3,-.0101140001788735,.2468792051076889,.5175017714500427,0,2,1,13,12,6,-1,5,13,4,6,3,-.0186170600354671,.5756294131278992,.4628978967666626,0,2,14,11,5,2,-1,14,12,5,1,2,.0059225959703326225,.5169625878334045,.3214271068572998,0,3,2,15,14,4,-1,2,15,7,2,2,9,17,7,2,2,-.006294507998973131,.3872014880180359,.5141636729240417,0,3,3,7,14,2,-1,10,7,7,1,2,3,8,7,1,2,.0065353019163012505,.4853048920631409,.6310489773750305,0,2,1,11,4,2,-1,1,12,4,1,2,.0010878399480134249,.5117315053939819,.3723258972167969,0,2,14,0,6,14,-1,16,0,2,14,3,-.0225422400981188,.5692740082740784,.4887112975120544,0,2,4,11,1,3,-1,4,12,1,1,3,-.003006566083058715,.2556012868881226,.5003992915153503,0,2,14,0,6,14,-1,16,0,2,14,3,.007474127225577831,.4810872972011566,.5675926804542542,0,2,1,10,3,7,-1,2,10,1,7,3,.0261623207479715,.4971194863319397,.1777237057685852,0,2,8,12,9,2,-1,8,13,9,1,2,.0009435273823328316,.4940010905265808,.549125075340271,0,2,0,6,20,1,-1,10,6,10,1,2,.0333632417023182,.5007612109184265,.2790724039077759,0,2,8,4,4,4,-1,8,4,2,4,2,-.0151186501607299,.7059578895568848,.4973031878471375,0,2,0,0,2,2,-1,0,1,2,1,2,.0009864894673228264,.5128620266914368,.3776761889457703,105.76110076904297,213,0,2,5,3,10,9,-1,5,6,10,3,3,-.0951507985591888,.6470757126808167,.4017286896705627,0,2,15,2,4,10,-1,15,2,2,10,2,.006270234007388353,.399982213973999,.574644923210144,0,2,8,2,2,7,-1,9,2,1,7,2,.000300180894555524,.355877012014389,.5538809895515442,0,2,7,4,12,1,-1,11,4,4,1,3,.0011757409665733576,.425653487443924,.5382617712020874,0,2,3,4,9,1,-1,6,4,3,1,3,4423526843311265e-20,.3682908117771149,.5589926838874817,0,2,15,10,1,4,-1,15,12,1,2,2,-29936920327600092e-21,.5452470183372498,.4020367860794067,0,2,4,10,6,4,-1,7,10,3,4,2,.003007319988682866,.5239058136940002,.3317843973636627,0,2,15,9,1,6,-1,15,12,1,3,2,-.0105138896033168,.4320689141750336,.5307983756065369,0,2,7,17,6,3,-1,7,18,6,1,3,.008347682654857635,.4504637122154236,.6453298926353455,0,3,14,3,2,16,-1,15,3,1,8,2,14,11,1,8,2,-.0031492270063608885,.4313425123691559,.5370525121688843,0,2,4,9,1,6,-1,4,12,1,3,2,-1443564997316571e-20,.5326603055000305,.381797194480896,0,2,12,1,5,2,-1,12,2,5,1,2,-.00042855090578086674,.430516391992569,.5382009744644165,0,3,6,18,4,2,-1,6,18,2,1,2,8,19,2,1,2,.00015062429883982986,.4235970973968506,.5544965267181396,0,3,2,4,16,10,-1,10,4,8,5,2,2,9,8,5,2,.0715598315000534,.5303059816360474,.2678802907466888,0,2,6,5,1,10,-1,6,10,1,5,2,.0008409518050029874,.3557108938694,.5205433964729309,0,2,4,8,15,2,-1,9,8,5,2,3,.0629865005612373,.5225362777709961,.2861376106739044,0,2,1,8,15,2,-1,6,8,5,2,3,-.0033798629883676767,.3624185919761658,.5201697945594788,0,2,9,5,3,6,-1,9,7,3,2,3,-.00011810739670181647,.547447681427002,.3959893882274628,0,2,5,7,8,2,-1,9,7,4,2,2,-.0005450560129247606,.3740422129631043,.5215715765953064,0,2,9,11,2,3,-1,9,12,2,1,3,-.0018454910023137927,.5893052220344543,.4584448933601379,0,2,1,0,16,3,-1,1,1,16,1,3,-.0004383237101137638,.4084582030773163,.5385351181030273,0,2,11,2,7,2,-1,11,3,7,1,2,-.002400083001703024,.377745509147644,.5293580293655396,0,2,5,1,10,18,-1,5,7,10,6,3,-.0987957417964935,.2963612079620361,.5070089101791382,0,2,17,4,3,2,-1,18,4,1,2,3,.0031798239797353745,.4877632856369019,.6726443767547607,0,2,8,13,1,3,-1,8,14,1,1,3,.00032406419632025063,.4366911053657532,.5561109781265259,0,2,3,14,14,6,-1,3,16,14,2,3,-.0325472503900528,.31281578540802,.5308616161346436,0,2,0,2,3,4,-1,1,2,1,4,3,-.007756113074719906,.6560224890708923,.4639872014522553,0,2,12,1,5,2,-1,12,2,5,1,2,.0160272493958473,.5172680020332336,.3141897916793823,0,2,3,1,5,2,-1,3,2,5,1,2,710023505234858e-20,.4084446132183075,.5336294770240784,0,2,10,13,2,3,-1,10,14,2,1,3,.007342280820012093,.4966922104358673,.660346508026123,0,2,8,13,2,3,-1,8,14,2,1,3,-.0016970280557870865,.5908237099647522,.4500182867050171,0,2,14,12,2,3,-1,14,13,2,1,3,.0024118260480463505,.5315160751342773,.3599720895290375,0,2,7,2,2,3,-1,7,3,2,1,3,-.005530093796551228,.2334040999412537,.4996814131736755,0,3,5,6,10,4,-1,10,6,5,2,2,5,8,5,2,2,-.0026478730142116547,.5880935788154602,.4684734046459198,0,2,9,13,1,6,-1,9,16,1,3,2,.0112956296652555,.4983777105808258,.1884590983390808,0,3,10,12,2,2,-1,11,12,1,1,2,10,13,1,1,2,-.000669528788421303,.5872138142585754,.4799019992351532,0,2,4,12,2,3,-1,4,13,2,1,3,.0014410680159926414,.5131189227104187,.350101113319397,0,2,14,4,6,6,-1,14,6,6,2,3,.0024637870956212282,.5339372158050537,.4117639064788818,0,2,8,17,2,3,-1,8,18,2,1,3,.0003311451873742044,.4313383102416992,.5398246049880981,0,2,16,4,4,6,-1,16,6,4,2,3,-.0335572697222233,.26753368973732,.5179154872894287,0,2,0,4,4,6,-1,0,6,4,2,3,.0185394193977118,.4973869919776917,.2317177057266235,0,2,14,6,2,3,-1,14,6,1,3,2,-.00029698139405809343,.552970826625824,.4643664062023163,0,2,4,9,8,1,-1,8,9,4,1,2,-.0004557725915219635,.5629584193229675,.4469191133975983,0,2,8,12,4,3,-1,8,13,4,1,3,-.0101589802652597,.6706212759017944,.4925918877124786,0,2,5,12,10,6,-1,5,14,10,2,3,-22413829356082715e-21,.5239421725273132,.3912901878356934,0,2,11,12,1,2,-1,11,13,1,1,2,7203496352303773e-20,.4799438118934631,.5501788854598999,0,2,8,15,4,2,-1,8,16,4,1,2,-.006926720961928368,.6930009722709656,.4698084890842438,0,3,6,9,8,8,-1,10,9,4,4,2,6,13,4,4,2,-.007699783891439438,.409962385892868,.5480883121490479,0,3,7,12,4,6,-1,7,12,2,3,2,9,15,2,3,2,-.007313054986298084,.3283475935459137,.5057886242866516,0,2,10,11,3,1,-1,11,11,1,1,3,.0019650589674711227,.4978047013282776,.6398249864578247,0,3,9,7,2,10,-1,9,7,1,5,2,10,12,1,5,2,.007164760027080774,.4661160111427307,.6222137212753296,0,2,8,0,6,6,-1,10,0,2,6,3,-.0240786392241716,.2334644943475723,.5222162008285522,0,2,3,11,2,6,-1,3,13,2,2,3,-.0210279691964388,.1183653995394707,.4938226044178009,0,2,16,12,1,2,-1,16,13,1,1,2,.00036017020465806127,.5325019955635071,.4116711020469666,0,3,1,14,6,6,-1,1,14,3,3,2,4,17,3,3,2,-.0172197297215462,.6278762221336365,.4664269089698792,0,2,13,1,3,6,-1,14,1,1,6,3,-.007867214269936085,.3403415083885193,.5249736905097961,0,2,8,8,2,2,-1,8,9,2,1,2,-.000447773898486048,.3610411882400513,.5086259245872498,0,2,9,9,3,3,-1,10,9,1,3,3,.005548601038753986,.4884265959262848,.6203498244285583,0,2,8,7,3,3,-1,8,8,3,1,3,-.00694611482322216,.262593001127243,.5011097192764282,0,2,14,0,2,3,-1,14,0,1,3,2,.00013569870498031378,.4340794980525971,.5628312230110168,0,2,1,0,18,9,-1,7,0,6,9,3,-.0458802506327629,.6507998704910278,.4696274995803833,0,2,11,5,4,15,-1,11,5,2,15,2,-.0215825606137514,.3826502859592438,.5287616848945618,0,2,5,5,4,15,-1,7,5,2,15,2,-.0202095396816731,.3233368098735809,.5074477195739746,0,2,14,0,2,3,-1,14,0,1,3,2,.005849671084433794,.5177603960037231,.4489670991897583,0,2,4,0,2,3,-1,5,0,1,3,2,-5747637987951748e-20,.4020850956439972,.5246363878250122,0,3,11,12,2,2,-1,12,12,1,1,2,11,13,1,1,2,-.001151310047134757,.6315072178840637,.490515410900116,0,3,7,12,2,2,-1,7,12,1,1,2,8,13,1,1,2,.0019862831104546785,.4702459871768951,.6497151255607605,0,2,12,0,3,4,-1,13,0,1,4,3,-.005271951202303171,.3650383949279785,.5227652788162231,0,2,4,11,3,3,-1,4,12,3,1,3,.0012662699446082115,.5166100859642029,.387761801481247,0,2,12,7,4,2,-1,12,8,4,1,2,-.006291944067925215,.737589418888092,.5023847818374634,0,2,8,10,3,2,-1,9,10,1,2,3,.000673601112794131,.4423226118087769,.5495585799217224,0,2,9,9,3,2,-1,10,9,1,2,3,-.0010523450328037143,.5976396203041077,.4859583079814911,0,2,8,9,3,2,-1,9,9,1,2,3,-.00044216238893568516,.5955939292907715,.4398930966854096,0,2,12,0,3,4,-1,13,0,1,4,3,.0011747940443456173,.5349888205528259,.4605058133602142,0,2,5,0,3,4,-1,6,0,1,4,3,.005245743785053492,.5049191117286682,.2941577136516571,0,3,4,14,12,4,-1,10,14,6,2,2,4,16,6,2,2,-.0245397202670574,.2550177872180939,.5218586921691895,0,2,8,13,2,3,-1,8,14,2,1,3,.0007379304151982069,.4424861073493958,.5490816235542297,0,2,10,10,3,8,-1,10,14,3,4,2,.0014233799884095788,.5319514274597168,.4081355929374695,0,3,8,10,4,8,-1,8,10,2,4,2,10,14,2,4,2,-.0024149110540747643,.4087659120559692,.5238950252532959,0,2,10,8,3,1,-1,11,8,1,1,3,-.0012165299849584699,.567457914352417,.4908052980899811,0,2,9,12,1,6,-1,9,15,1,3,2,-.0012438809499144554,.4129425883293152,.5256118178367615,0,2,10,8,3,1,-1,11,8,1,1,3,.006194273941218853,.5060194134712219,.7313653230667114,0,2,7,8,3,1,-1,8,8,1,1,3,-.0016607169527560472,.5979632139205933,.4596369862556458,0,2,5,2,15,14,-1,5,9,15,7,2,-.0273162592202425,.4174365103244782,.5308842062950134,0,3,2,1,2,10,-1,2,1,1,5,2,3,6,1,5,2,-.00158455700147897,.56158047914505,.4519486129283905,0,2,14,14,2,3,-1,14,15,2,1,3,-.0015514739789068699,.4076187014579773,.5360785126686096,0,2,2,7,3,3,-1,3,7,1,3,3,.0003844655875582248,.4347293972969055,.5430442094802856,0,2,17,4,3,3,-1,17,5,3,1,3,-.0146722598001361,.1659304946660996,.5146093964576721,0,2,0,4,3,3,-1,0,5,3,1,3,.008160888217389584,.4961819052696228,.1884745955467224,0,3,13,5,6,2,-1,16,5,3,1,2,13,6,3,1,2,.0011121659772470593,.4868263900279999,.6093816161155701,0,2,4,19,12,1,-1,8,19,4,1,3,-.007260377053171396,.6284325122833252,.4690375924110413,0,2,12,12,2,4,-1,12,14,2,2,2,-.00024046430189628154,.5575000047683716,.4046044051647186,0,2,3,15,1,3,-1,3,16,1,1,3,-.00023348190006799996,.4115762114524841,.5252848267555237,0,2,11,16,6,4,-1,11,16,3,4,2,.005573648028075695,.4730072915554047,.5690100789070129,0,2,2,10,3,10,-1,3,10,1,10,3,.0306237693876028,.4971886873245239,.1740095019340515,0,2,12,8,2,4,-1,12,8,1,4,2,.0009207479888573289,.5372117757797241,.4354872107505798,0,2,6,8,2,4,-1,7,8,1,4,2,-4355073906481266e-20,.5366883873939514,.4347316920757294,0,2,10,14,2,3,-1,10,14,1,3,2,-.006645271088927984,.3435518145561218,.516053318977356,0,2,5,1,10,3,-1,10,1,5,3,2,.0432219989597797,.4766792058944702,.7293652892112732,0,2,10,7,3,2,-1,11,7,1,2,3,.0022331769578158855,.5029315948486328,.5633171200752258,0,2,5,6,9,2,-1,8,6,3,2,3,.0031829739455133677,.4016092121601105,.5192136764526367,0,2,9,8,2,2,-1,9,9,2,1,2,-.00018027749320026487,.4088315963745117,.5417919754981995,0,3,2,11,16,6,-1,2,11,8,3,2,10,14,8,3,2,-.0052934689447283745,.407567709684372,.5243561863899231,0,3,12,7,2,2,-1,13,7,1,1,2,12,8,1,1,2,.0012750959722325206,.4913282990455627,.6387010812759399,0,2,9,5,2,3,-1,9,6,2,1,3,.004338532220572233,.5031672120094299,.2947346866130829,0,2,9,7,3,2,-1,10,7,1,2,3,.00852507445961237,.4949789047241211,.6308869123458862,0,2,5,1,8,12,-1,5,7,8,6,2,-.0009426635224372149,.5328366756439209,.4285649955272675,0,2,13,5,2,2,-1,13,6,2,1,2,.0013609660090878606,.4991525113582611,.5941501259803772,0,2,5,5,2,2,-1,5,6,2,1,2,.0004478250921238214,.4573504030704498,.5854480862617493,0,2,12,4,3,3,-1,12,5,3,1,3,.001336005050688982,.4604358971118927,.584905207157135,0,2,4,14,2,3,-1,4,15,2,1,3,-.0006096754805184901,.3969388902187347,.522942304611206,0,2,12,4,3,3,-1,12,5,3,1,3,-.002365678083151579,.5808320045471191,.4898357093334198,0,2,5,4,3,3,-1,5,5,3,1,3,.001073434017598629,.435121089220047,.5470039248466492,0,3,9,14,2,6,-1,10,14,1,3,2,9,17,1,3,2,.0021923359017819166,.535506010055542,.3842903971672058,0,2,8,14,3,2,-1,9,14,1,2,3,.005496861878782511,.5018138885498047,.2827191948890686,0,2,9,5,6,6,-1,11,5,2,6,3,-.0753688216209412,.1225076019763947,.5148826837539673,0,2,5,5,6,6,-1,7,5,2,6,3,.0251344703137875,.4731766879558563,.702544629573822,0,2,13,13,1,2,-1,13,14,1,1,2,-2935859993158374e-20,.5430532097816467,.465608686208725,0,2,0,2,10,2,-1,0,3,10,1,2,-.0005835591000504792,.4031040072441101,.5190119743347168,0,2,13,13,1,2,-1,13,14,1,1,2,-.0026639450807124376,.4308126866817474,.5161771178245544,0,3,5,7,2,2,-1,5,7,1,1,2,6,8,1,1,2,-.0013804089976474643,.621982991695404,.4695515930652618,0,2,13,5,2,7,-1,13,5,1,7,2,.0012313219485804439,.5379363894462585,.4425831139087677,0,2,6,13,1,2,-1,6,14,1,1,2,-14644179827882908e-21,.5281640291213989,.4222503006458283,0,2,11,0,3,7,-1,12,0,1,7,3,-.0128188095986843,.2582092881202698,.5179932713508606,0,3,0,3,2,16,-1,0,3,1,8,2,1,11,1,8,2,.0228521898388863,.4778693020343781,.7609264254570007,0,2,11,0,3,7,-1,12,0,1,7,3,.0008230597013607621,.5340992212295532,.4671724140644074,0,2,6,0,3,7,-1,7,0,1,7,3,.0127701200544834,.4965761005878449,.1472366005182266,0,2,11,16,8,4,-1,11,16,4,4,2,-.0500515103340149,.641499400138855,.5016592144966125,0,2,1,16,8,4,-1,5,16,4,4,2,.0157752707600594,.4522320032119751,.5685362219810486,0,2,13,5,2,7,-1,13,5,1,7,2,-.0185016207396984,.2764748930931091,.5137959122657776,0,2,5,5,2,7,-1,6,5,1,7,2,.0024626250378787518,.5141941905021667,.3795408010482788,0,2,18,6,2,14,-1,18,13,2,7,2,.0629161670804024,.5060648918151855,.658043384552002,0,2,6,10,3,4,-1,6,12,3,2,2,-21648500478477217e-21,.5195388197898865,.401988685131073,0,2,14,7,1,2,-1,14,8,1,1,2,.0021180990152060986,.4962365031242371,.5954458713531494,0,3,0,1,18,6,-1,0,1,9,3,2,9,4,9,3,2,-.0166348908096552,.3757933080196381,.517544686794281,0,2,14,7,1,2,-1,14,8,1,1,2,-.002889947034418583,.6624013781547546,.5057178735733032,0,2,0,6,2,14,-1,0,13,2,7,2,.076783262193203,.4795796871185303,.8047714829444885,0,2,17,0,3,12,-1,18,0,1,12,3,.003917067777365446,.4937882125377655,.5719941854476929,0,2,0,6,18,3,-1,0,7,18,1,3,-.0726706013083458,.0538945607841015,.4943903982639313,0,2,6,0,14,16,-1,6,8,14,8,2,.5403950214385986,.5129774212837219,.1143338978290558,0,2,0,0,3,12,-1,1,0,1,12,3,.0029510019812732935,.4528343975543976,.5698574185371399,0,2,13,0,3,7,-1,14,0,1,7,3,.0034508369863033295,.5357726812362671,.4218730926513672,0,2,5,7,1,2,-1,5,8,1,1,2,-.0004207793972454965,.5916172862052917,.4637925922870636,0,2,14,4,6,6,-1,14,6,6,2,3,.0033051050268113613,.5273385047912598,.438204288482666,0,2,5,7,7,2,-1,5,8,7,1,2,.0004773506079800427,.4046528041362763,.5181884765625,0,2,8,6,6,9,-1,8,9,6,3,3,-.0259285103529692,.7452235817909241,.5089386105537415,0,2,5,4,6,1,-1,7,4,2,1,3,-.002972979098558426,.3295435905456543,.5058795213699341,0,3,13,0,6,4,-1,16,0,3,2,2,13,2,3,2,2,.005850832909345627,.4857144057750702,.5793024897575378,0,2,1,2,18,12,-1,1,6,18,4,3,-.0459675192832947,.4312731027603149,.5380653142929077,0,2,3,2,17,12,-1,3,6,17,4,3,.1558596044778824,.5196170210838318,.1684713959693909,0,2,5,14,7,3,-1,5,15,7,1,3,.0151648297905922,.4735757112503052,.6735026836395264,0,2,10,14,1,3,-1,10,15,1,1,3,-.0010604249546304345,.5822926759719849,.4775702953338623,0,2,3,14,3,3,-1,3,15,3,1,3,.006647629197686911,.4999198913574219,.231953501701355,0,2,14,4,6,6,-1,14,6,6,2,3,-.0122311301529408,.4750893115997315,.5262982249259949,0,2,0,4,6,6,-1,0,6,6,2,3,.005652888212352991,.5069767832756042,.3561818897724152,0,2,12,5,4,3,-1,12,6,4,1,3,.0012977829901501536,.4875693917274475,.5619062781333923,0,2,4,5,4,3,-1,4,6,4,1,3,.0107815898954868,.4750770032405853,.6782308220863342,0,2,18,0,2,6,-1,18,2,2,2,3,.002865477930754423,.5305461883544922,.4290736019611359,0,2,8,1,4,9,-1,10,1,2,9,2,.0028663428965955973,.4518479108810425,.5539351105690002,0,2,6,6,8,2,-1,6,6,4,2,2,-.005198332015424967,.4149119853973389,.5434188842773438,0,3,6,5,4,2,-1,6,5,2,1,2,8,6,2,1,2,.005373999010771513,.471789687871933,.6507657170295715,0,2,10,5,2,3,-1,10,6,2,1,3,-.0146415298804641,.2172164022922516,.5161777138710022,0,2,9,5,1,3,-1,9,6,1,1,3,-15042580344015732e-21,.533738374710083,.4298836886882782,0,2,9,10,2,2,-1,9,11,2,1,2,-.0001187566012958996,.4604594111442566,.5582447052001953,0,2,0,8,4,3,-1,0,9,4,1,3,.0169955305755138,.4945895075798035,.0738800764083862,0,2,6,0,8,6,-1,6,3,8,3,2,-.0350959412753582,.70055091381073,.4977591037750244,0,3,1,0,6,4,-1,1,0,3,2,2,4,2,3,2,2,.0024217350874096155,.4466265141963959,.5477694272994995,0,2,13,0,3,7,-1,14,0,1,7,3,-.0009634033776819706,.4714098870754242,.5313338041305542,0,2,9,16,2,2,-1,9,17,2,1,2,.00016391130338888615,.4331546127796173,.5342242121696472,0,2,11,4,6,10,-1,11,9,6,5,2,-.0211414601653814,.2644700109958649,.5204498767852783,0,2,0,10,19,2,-1,0,11,19,1,2,.0008777520270086825,.5208349823951721,.4152742922306061,0,2,9,5,8,9,-1,9,8,8,3,3,-.0279439203441143,.6344125270843506,.5018811821937561,0,2,4,0,3,7,-1,5,0,1,7,3,.006729737855494022,.5050438046455383,.3500863909721375,0,3,8,6,4,12,-1,10,6,2,6,2,8,12,2,6,2,.0232810396701097,.4966318011283875,.6968677043914795,0,2,0,2,6,4,-1,0,4,6,2,2,-.0116449799388647,.3300260007381439,.5049629807472229,0,2,8,15,4,3,-1,8,16,4,1,3,.0157643090933561,.4991598129272461,.7321153879165649,0,2,8,0,3,7,-1,9,0,1,7,3,-.001361147966235876,.3911735117435455,.5160670876502991,0,2,9,5,3,4,-1,10,5,1,4,3,-.0008152233785949647,.5628911256790161,.49497190117836,0,2,8,5,3,4,-1,9,5,1,4,3,-.0006006627227179706,.585359513759613,.4550595879554749,0,2,7,6,6,1,-1,9,6,2,1,3,.0004971551825292408,.4271470010280609,.5443599224090576,0,3,7,14,4,4,-1,7,14,2,2,2,9,16,2,2,2,.0023475370835512877,.5143110752105713,.3887656927108765,0,3,13,14,4,6,-1,15,14,2,3,2,13,17,2,3,2,-.008926156908273697,.6044502258300781,.497172087430954,0,2,7,8,1,8,-1,7,12,1,4,2,-.013919910416007,.2583160996437073,.5000367760658264,0,3,16,0,2,8,-1,17,0,1,4,2,16,4,1,4,2,.0010209949687123299,.4857374131679535,.5560358166694641,0,3,2,0,2,8,-1,2,0,1,4,2,3,4,1,4,2,-.0027441629208624363,.5936884880065918,.464577704668045,0,2,6,1,14,3,-1,6,2,14,1,3,-.0162001308053732,.3163014948368073,.5193495154380798,0,2,7,9,3,10,-1,7,14,3,5,2,.004333198070526123,.5061224102973938,.3458878993988037,0,2,9,14,2,2,-1,9,15,2,1,2,.0005849793087691069,.4779017865657806,.5870177745819092,0,2,7,7,6,8,-1,7,11,6,4,2,-.0022466450463980436,.4297851026058197,.5374773144721985,0,2,9,7,3,6,-1,9,10,3,3,2,.0023146099410951138,.5438671708106995,.4640969932079315,0,2,7,13,3,3,-1,7,14,3,1,3,.008767912164330482,.472689300775528,.6771789789199829,0,2,9,9,2,2,-1,9,10,2,1,2,-.00022448020172305405,.4229173064231873,.5428048968315125,0,2,0,1,18,2,-1,6,1,6,2,3,-.007433602120727301,.6098880767822266,.4683673977851868,0,2,7,1,6,14,-1,7,8,6,7,2,-.0023189240600913763,.5689436793327332,.4424242079257965,0,2,1,9,18,1,-1,7,9,6,1,3,-.0021042178850620985,.3762221038341522,.5187087059020996,0,2,9,7,2,2,-1,9,7,1,2,2,.000460348412161693,.4699405133724213,.5771207213401794,0,2,9,3,2,9,-1,10,3,1,9,2,.0010547629790380597,.4465216994285584,.5601701736450195,0,2,18,14,2,3,-1,18,15,2,1,3,.0008714881842024624,.544980525970459,.3914709091186523,0,2,7,11,3,1,-1,8,11,1,1,3,.00033364820410497487,.4564009010791779,.5645738840103149,0,2,10,8,3,4,-1,11,8,1,4,3,-.0014853250468149781,.5747377872467041,.4692778885364533,0,2,7,14,3,6,-1,8,14,1,6,3,.0030251620337367058,.5166196823120117,.3762814104557037,0,2,10,8,3,4,-1,11,8,1,4,3,.005028074141591787,.5002111792564392,.6151527166366577,0,2,7,8,3,4,-1,8,8,1,4,3,-.0005816451157443225,.5394598245620728,.4390751123428345,0,2,7,9,6,9,-1,7,12,6,3,3,.0451415292918682,.5188326835632324,.206303596496582,0,2,0,14,2,3,-1,0,15,2,1,3,-.001079562003724277,.3904685080051422,.5137907266616821,0,2,11,12,1,2,-1,11,13,1,1,2,.00015995999274309725,.4895322918891907,.5427504181861877,0,2,4,3,8,3,-1,8,3,4,3,2,-.0193592701107264,.6975228786468506,.4773507118225098,0,2,0,4,20,6,-1,0,4,10,6,2,.207255095243454,.5233635902404785,.3034991919994354,0,2,9,14,1,3,-1,9,15,1,1,3,-.00041953290929086506,.5419396758079529,.4460186064243317,0,2,8,14,4,3,-1,8,15,4,1,3,.0022582069505006075,.4815764129161835,.6027408838272095,0,2,0,15,14,4,-1,0,17,14,2,2,-.0067811207845807076,.3980278968811035,.5183305740356445,0,2,1,14,18,6,-1,1,17,18,3,2,.0111543098464608,.543123185634613,.4188759922981262,0,3,0,0,10,6,-1,0,0,5,3,2,5,3,5,3,2,.0431624315679073,.4738228023052216,.6522961258888245]);
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/js/stats.min.js" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/js/stats.min.js"
deleted file mode 100644
index e5ced698..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/js/stats.min.js"
+++ /dev/null
@@ -1,31 +0,0 @@
-// stats.js - http://github.com/mrdoob/stats.js
-var Stats=function(){var l=Date.now(),m=l,g=0,n=Infinity,o=0,h=0,p=Infinity,q=0,r=0,s=0,f=document.createElement("div");f.id="stats";f.addEventListener("mousedown",function(b){b.preventDefault();t(++s%2)},!1);f.style.cssText="width:80px;opacity:0.9;cursor:pointer";var a=document.createElement("div");a.id="fps";a.style.cssText="padding:0 0 3px 3px;text-align:left;background-color:#002";f.appendChild(a);var i=document.createElement("div");i.id="fpsText";i.style.cssText="color:#0ff;font-family:Helvetica,Arial,sans-serif;font-size:9px;font-weight:bold;line-height:15px";
-i.innerHTML="FPS";a.appendChild(i);var c=document.createElement("div");c.id="fpsGraph";c.style.cssText="position:relative;width:74px;height:30px;background-color:#0ff";for(a.appendChild(c);74>c.children.length;){var j=document.createElement("span");j.style.cssText="width:1px;height:30px;float:left;background-color:#113";c.appendChild(j)}var d=document.createElement("div");d.id="ms";d.style.cssText="padding:0 0 3px 3px;text-align:left;background-color:#020;display:none";f.appendChild(d);var k=document.createElement("div");
-k.id="msText";k.style.cssText="color:#0f0;font-family:Helvetica,Arial,sans-serif;font-size:9px;font-weight:bold;line-height:15px";k.innerHTML="MS";d.appendChild(k);var e=document.createElement("div");e.id="msGraph";e.style.cssText="position:relative;width:74px;height:30px;background-color:#0f0";for(d.appendChild(e);74>e.children.length;)j=document.createElement("span"),j.style.cssText="width:1px;height:30px;float:left;background-color:#131",e.appendChild(j);var t=function(b){s=b;switch(s){case 0:a.style.display=
-"block";d.style.display="none";break;case 1:a.style.display="none",d.style.display="block"}};return{REVISION:11,domElement:f,setMode:t,begin:function(){l=Date.now()},end:function(){var b=Date.now();g=b-l;n=Math.min(n,g);o=Math.max(o,g);k.textContent=g+" MS ("+n+"-"+o+")";var a=Math.min(30,30-30*(g/200));e.appendChild(e.firstChild).style.height=a+"px";r++;b>m+1E3&&(h=Math.round(1E3*r/(b-m)),p=Math.min(p,h),q=Math.max(q,h),i.textContent=h+" FPS ("+p+"-"+q+")",a=Math.min(30,30-30*(h/100)),c.appendChild(c.firstChild).style.height=
-a+"px",m=b,r=0);return b},update:function(){l=this.end()}}};
-
-var stats = new Stats();
-stats.setMode(2);
-stats.domElement.style.position = 'absolute';
-stats.domElement.style.left = '10px';
-stats.domElement.style.top = '50px';
-stats.domElement.style.zIndex = 100;
-document.addEventListener('DOMContentLoaded', function(event) {
- document.body.appendChild(stats.domElement);
-});
-
-var objectEmit_ = tracking.ObjectTracker.prototype.emit;
-var colorEmit_ = tracking.ColorTracker.prototype.emit;
-
-stats.begin();
-
-tracking.ObjectTracker.prototype.emit = function() {
- stats.end();
- objectEmit_.apply(this, arguments);
-};
-
-tracking.ColorTracker.prototype.emit = function() {
- stats.end();
- colorEmit_.apply(this, arguments);
-};
diff --git "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/js/tracking-min.js" "b/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/js/tracking-min.js"
deleted file mode 100644
index 125f915c..00000000
--- "a/springboot101/\344\272\272\350\204\270\350\257\206\345\210\253/springboot-detect-faces/src/main/resources/static/js/tracking-min.js"
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * tracking - A modern approach for Computer Vision on the web.
- * @author Eduardo Lundgren
- * @version v1.1.3
- * @link http://trackingjs.com
- * @license BSD
- */
-!function(t,r){t.tracking=t.tracking||{},tracking.inherits=function(t,r){function n(){}n.prototype=r.prototype,t.superClass_=r.prototype,t.prototype=new n,t.prototype.constructor=t,t.base=function(t,n){var e=Array.prototype.slice.call(arguments,2);return r.prototype[n].apply(t,e)}},tracking.initUserMedia_=function(r,n){t.navigator.mediaDevices.getUserMedia({video:!0,audio:!(!n||!n.audio)}).then(function(t){r.srcObject=t})["catch"](function(t){throw Error("Cannot capture user camera.")})},tracking.isNode=function(t){return t.nodeType||this.isWindow(t)},tracking.isWindow=function(t){return!!(t&&t.alert&&t.document)},tracking.one=function(t,r){return this.isNode(t)?t:(r||document).querySelector(t)},tracking.track=function(t,r,n){if(t=tracking.one(t),!t)throw new Error("Element not found, try a different element or selector.");if(!r)throw new Error("Tracker not specified, try `tracking.track(element, new tracking.FaceTracker())`.");switch(t.nodeName.toLowerCase()){case"canvas":return this.trackCanvas_(t,r,n);case"img":return this.trackImg_(t,r,n);case"video":return n&&n.camera&&this.initUserMedia_(t,n),this.trackVideo_(t,r,n);default:throw new Error("Element not supported, try in a canvas, img, or video.")}},tracking.trackCanvas_=function(t,r){var n=this,e=new tracking.TrackerTask(r);return e.on("run",function(){n.trackCanvasInternal_(t,r)}),e.run()},tracking.trackCanvasInternal_=function(t,r){var n=t.width,e=t.height,a=t.getContext("2d"),i=a.getImageData(0,0,n,e);r.track(i.data,n,e)},tracking.trackImg_=function(t,r){var n=t.width,e=t.height,a=document.createElement("canvas");a.width=n,a.height=e;var i=new tracking.TrackerTask(r);return i.on("run",function(){tracking.Canvas.loadImage(a,t.src,0,0,n,e,function(){tracking.trackCanvasInternal_(a,r)})}),i.run()},tracking.trackVideo_=function(r,n){var e,a,i=document.createElement("canvas"),o=i.getContext("2d"),c=function(){e=r.offsetWidth,a=r.offsetHeight,i.width=e,i.height=a};c(),r.addEventListener("resize",c);var s,g=function(){s=t.requestAnimationFrame(function(){if(r.readyState===r.HAVE_ENOUGH_DATA){try{o.drawImage(r,0,0,e,a)}catch(t){}tracking.trackCanvasInternal_(i,n)}g()})},h=new tracking.TrackerTask(n);return h.on("stop",function(){t.cancelAnimationFrame(s)}),h.on("run",function(){g()}),h.run()},t.URL||(t.URL=t.URL||t.webkitURL||t.msURL||t.oURL),navigator.getUserMedia||(navigator.getUserMedia=navigator.getUserMedia||navigator.webkitGetUserMedia||navigator.mozGetUserMedia||navigator.msGetUserMedia)}(window),function(){tracking.EventEmitter=function(){},tracking.EventEmitter.prototype.events_=null,tracking.EventEmitter.prototype.addListener=function(t,r){if("function"!=typeof r)throw new TypeError("Listener must be a function");return this.events_||(this.events_={}),this.emit("newListener",t,r),this.events_[t]||(this.events_[t]=[]),this.events_[t].push(r),this},tracking.EventEmitter.prototype.listeners=function(t){return this.events_&&this.events_[t]},tracking.EventEmitter.prototype.emit=function(t){var r=this.listeners(t);if(r){for(var n=Array.prototype.slice.call(arguments,1),e=0;e>2),i=0,o=0,c=0;c0&&(s=new Int32Array(r*n)),tracking.Image.computeIntegralImage(t,r,n,k,f,u,s);for(var l=c[0],m=c[1],d=e*a,v=d*l|0,p=d*m|0;v0&&this.isTriviallyExcluded(o,s,w,T,r,v,p)||this.evalStages_(c,k,f,u,w,T,r,v,p,d)&&(h[g++]={width:v,height:p,x:T,y:w});d*=a,v=d*l|0,p=d*m|0}return this.mergeRectangles_(h)},tracking.ViolaJones.isTriviallyExcluded=function(t,r,n,e,a,i,o){var c=n*a+e,s=c+i,g=c+o*a,h=g+i,k=(r[c]-r[s]-r[g]+r[h])/(i*o*255);return k0&&(v=Math.sqrt(d));for(var p=t.length,y=2;y=this.REGIONS_OVERLAP&&h/(f*(k/f))>=this.REGIONS_OVERLAP&&r.union(n,a)}}for(var u={},l=0;l>1)*(this.N>>5)),a=0,i=this.getRandomOffsets_(r),o=0,c=0;c>1,i=n.length>>1,o=new Array(a),c=0;c>5;fn},tracking.Fast.isCorner=function(t,r,n){if(this.isTriviallyExcluded(r,t,n))return!1;for(var e=0;e<16;e++){for(var a=!0,i=!0,o=0;o<9;o++){var c=r[e+o&15];if(!this.isBrighter(t,c,n)&&(i=!1,a===!1))break;if(!this.isDarker(t,c,n)&&(a=!1,i===!1))break}if(i||a)return!0}return!1},tracking.Fast.isDarker=function(t,r,n){return r-t>n},tracking.Fast.isTriviallyExcluded=function(t,r,n){var e=0,a=t[8],i=t[12],o=t[4],c=t[0];return this.isBrighter(c,r,n)&&e++,this.isBrighter(o,r,n)&&e++,this.isBrighter(a,r,n)&&e++,this.isBrighter(i,r,n)&&e++,e<3&&(e=0,this.isDarker(c,r,n)&&e++,this.isDarker(o,r,n)&&e++,this.isDarker(a,r,n)&&e++,this.isDarker(i,r,n)&&e++,e<3)},tracking.Fast.getCircleOffsets_=function(t){if(this.circles_[t])return this.circles_[t];var r=new Int32Array(16);return r[0]=-t-t-t,r[1]=r[0]+1,r[2]=r[1]+t+1,r[3]=r[2]+t+1,r[4]=r[3]+t,r[5]=r[4]+t,r[6]=r[5]+t-1,r[7]=r[6]+t-1,r[8]=r[7]-1,r[9]=r[8]-1,r[10]=r[9]-t-1,r[11]=r[10]-t-1,r[12]=r[11]-t,r[13]=r[12]-t,r[14]=r[13]-t+1,r[15]=r[14]-t+1,this.circles_[t]=r,r}}(),function(){tracking.Math={},tracking.Math.distance=function(t,r,n,e){var a=n-t,i=e-r;return Math.sqrt(a*a+i*i)},tracking.Math.hammingWeight=function(t){return t-=t>>1&1431655765,t=(858993459&t)+(t>>2&858993459),16843009*(t+(t>>4)&252645135)>>24},tracking.Math.uniformRandom=function(t,r){return t+Math.random()*(r-t)},tracking.Math.intersectRect=function(t,r,n,e,a,i,o,c){return!(a>n||oe||cn&&(n=c),se&&(e=s)}return{width:n-a,height:e-i,x:a,y:i}},tracking.ColorTracker.prototype.getColors=function(){return this.colors},tracking.ColorTracker.prototype.getMinDimension=function(){return this.minDimension},tracking.ColorTracker.prototype.getMaxDimension=function(){return this.maxDimension},tracking.ColorTracker.prototype.getMinGroupSize=function(){return this.minGroupSize},tracking.ColorTracker.prototype.getNeighboursForWidth_=function(t){if(tracking.ColorTracker.neighbours_[t])return tracking.ColorTracker.neighbours_[t];var r=new Int32Array(8);return r[0]=4*-t,r[1]=4*-t+4,r[2]=4,r[3]=4*t+4,r[4]=4*t,r[5]=4*t-4,r[6]=-4,r[7]=4*-t-4,tracking.ColorTracker.neighbours_[t]=r,r},tracking.ColorTracker.prototype.mergeRectangles_=function(t){for(var r,n=[],e=this.getMinDimension(),a=this.getMaxDimension(),i=0;i=e&&o.height>=e&&o.width<=a&&o.height<=a&&n.push(o)}return n},tracking.ColorTracker.prototype.setColors=function(t){this.colors=t},tracking.ColorTracker.prototype.setMinDimension=function(t){this.minDimension=t},tracking.ColorTracker.prototype.setMaxDimension=function(t){this.maxDimension=t},tracking.ColorTracker.prototype.setMinGroupSize=function(t){this.minGroupSize=t},tracking.ColorTracker.prototype.track=function(t,r,n){var e=this,a=this.getColors();if(!a)throw new Error('Colors not specified, try `new tracking.ColorTracker("magenta")`.');var i=[];a.forEach(function(a){i=i.concat(e.trackColor_(t,r,n,a))}),this.emit("track",{data:i})},tracking.ColorTracker.prototype.trackColor_=function(n,e,a,i){var o,c,s,g,h,k=tracking.ColorTracker.knownColors_[i],f=new Int32Array(n.length>>2),u=new Int8Array(n.length),l=this.getMinGroupSize(),m=this.getNeighboursForWidth_(e),d=new Int32Array(n.length),v=[],p=-4;if(!k)return v;for(var y=0;y=0;)if(s=d[h--],c=d[h--],g=d[h--],k(n[g],n[g+1],n[g+2],n[g+3],g,c,s)){f[o++]=s,f[o++]=c;for(var T=0;T=0&&M=0&&_=l){var C=this.calculateDimensions_(f,o);C&&(C.color=i,v.push(C))}}return this.mergeRectangles_(v)},tracking.ColorTracker.registerColor("cyan",function(t,r,n){var e=50,a=70,i=t-0,o=r-255,c=n-255;return r-t>=e&&n-t>=a||i*i+o*o+c*c<6400}),tracking.ColorTracker.registerColor("magenta",function(t,r,n){var e=50,a=t-255,i=r-0,o=n-255;return t-r>=e&&n-r>=e||a*a+i*i+o*o<19600}),tracking.ColorTracker.registerColor("yellow",function(t,r,n){var e=50,a=t-255,i=r-255,o=n-0;return t-n>=e&&r-n>=e||a*a+i*i+o*o<1e4});var t=new Int32Array([-1,-1,0,1,1,1,0,-1]),r=new Int32Array([0,1,1,1,0,-1,-1,-1])}(),function(){tracking.ObjectTracker=function(t){tracking.ObjectTracker.base(this,"constructor"),t&&(Array.isArray(t)||(t=[t]),Array.isArray(t)&&t.forEach(function(r,n){if("string"==typeof r&&(t[n]=tracking.ViolaJones.classifiers[r]),!t[n])throw new Error('Object classifier not valid, try `new tracking.ObjectTracker("face")`.')})),this.setClassifiers(t)},tracking.inherits(tracking.ObjectTracker,tracking.Tracker),tracking.ObjectTracker.prototype.edgesDensity=.2,tracking.ObjectTracker.prototype.initialScale=1,tracking.ObjectTracker.prototype.scaleFactor=1.25,tracking.ObjectTracker.prototype.stepSize=1.5,tracking.ObjectTracker.prototype.getClassifiers=function(){return this.classifiers},tracking.ObjectTracker.prototype.getEdgesDensity=function(){return this.edgesDensity},tracking.ObjectTracker.prototype.getInitialScale=function(){return this.initialScale},tracking.ObjectTracker.prototype.getScaleFactor=function(){return this.scaleFactor},tracking.ObjectTracker.prototype.getStepSize=function(){return this.stepSize},tracking.ObjectTracker.prototype.track=function(t,r,n){var e=this,a=this.getClassifiers();if(!a)throw new Error('Object classifier not specified, try `new tracking.ObjectTracker("face")`.');var i=[];a.forEach(function(a){i=i.concat(tracking.ViolaJones.detect(t,r,n,e.getInitialScale(),e.getScaleFactor(),e.getStepSize(),e.getEdgesDensity(),a))}),this.emit("track",{data:i})},tracking.ObjectTracker.prototype.setClassifiers=function(t){this.classifiers=t},tracking.ObjectTracker.prototype.setEdgesDensity=function(t){this.edgesDensity=t},tracking.ObjectTracker.prototype.setInitialScale=function(t){this.initialScale=t},tracking.ObjectTracker.prototype.setScaleFactor=function(t){this.scaleFactor=t},tracking.ObjectTracker.prototype.setStepSize=function(t){this.stepSize=t}}(),function(){tracking.LandmarksTracker=function(){tracking.LandmarksTracker.base(this,"constructor")},tracking.inherits(tracking.LandmarksTracker,tracking.ObjectTracker),tracking.LandmarksTracker.prototype.track=function(t,r,n){var e=tracking.ViolaJones.classifiers.face,a=tracking.ViolaJones.detect(t,r,n,this.getInitialScale(),this.getScaleFactor(),this.getStepSize(),this.getEdgesDensity(),e),i=tracking.LBF.align(t,r,n,a);this.emit("track",{data:{faces:a,landmarks:i}})}}(),function(){tracking.LBF={},tracking.LBF.Regressor=function(t){this.maxNumStages=t,this.rfs=new Array(t),this.models=new Array(t);for(var r=0;r
-
-
- 人脸识别
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{scanTip}}
-
-
-
-
-
人脸识别
-
-
-
-
-
-
-
-
hi 新朋友，欢迎来到小富的世界~
-
-
问题咨询欢迎关注公众号：程序员小富
-
-
-
人脸识别
-
-
-
-
-
-
-
-
hi 老朋友，欢迎回来~
-
-
问题咨询欢迎关注公众号：程序员小富
-
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
-
- springboot-erupt
- springboot-erupt
- 0.0.1-SNAPSHOT
- Demo project for Spring Boot
-
-
- 1.8
- 1.6.7
-
-
-
-
- org.springframework.boot
- spring-boot-starter
-
-
-
-
- org.projectlombok
- lombok
- 1.16.18
- provided
-
-
-
-
- xyz.erupt
- erupt-upms
- ${erupt.version}
-
-
-
- xyz.erupt
- erupt-security
- ${erupt.version}
-
-
-
- xyz.erupt
- erupt-web
- ${erupt.version}
-
-
-
- xyz.erupt
- erupt-job
- ${erupt.version}
-
-
-
- xyz.erupt
- erupt-tpl
- ${erupt.version}
-
-
-
- xyz.erupt
- erupt-generator
- ${erupt.version}
-
-
-
- xyz.erupt
- erupt-monitor
- ${erupt.version}
-
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
- compile
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
-
-
- nexus-aliyun
- nexus-aliyun
- http://maven.aliyun.com/nexus/content/repositories/central
-
- true
-
-
- false
-
-
-
-
-
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/java/com/springboot101/SpringBootEruptApplication.java" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/java/com/springboot101/SpringBootEruptApplication.java"
deleted file mode 100644
index 85092ee0..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/java/com/springboot101/SpringBootEruptApplication.java"
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.annotation.ComponentScan;
-import xyz.erupt.core.annotation.EruptScan;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-@SpringBootApplication
-@ComponentScan({"xyz.erupt", "com.springboot101.erupt.model"}) // ↓ xyz.erupt必须有
-@EntityScan({"xyz.erupt", "com.springboot101.erupt.model"}) // ↓ 如果包名com.example.demo有变化
-@EruptScan({"xyz.erupt", "com.springboot101.erupt.model"}) // → 要修改为变化后的包名
-public class SpringBootEruptApplication {
-
- public static void main(String[] args) throws URISyntaxException, IOException {
- SpringApplication.run(SpringBootEruptApplication.class, args);
- System.setProperty("java.awt.headless", "false");
- }
-}
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/java/com/springboot101/filter/StudentFilter.java" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/java/com/springboot101/filter/StudentFilter.java"
deleted file mode 100644
index b6f6e38d..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/java/com/springboot101/filter/StudentFilter.java"
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.springboot101.filter;
-
-import xyz.erupt.annotation.fun.FilterHandler;
-
-
-public class StudentFilter implements FilterHandler {
-
- /**
- * @param condition 条件表达式
- * @param params 注解参数
- */
- @Override
- public String filter(String condition, String[] params) {
- return condition + " = '" + params[0] + "'";
- }
-
-}
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/java/com/springboot101/model/Student.java" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/java/com/springboot101/model/Student.java"
deleted file mode 100644
index 6c55bca1..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/java/com/springboot101/model/Student.java"
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.springboot101.model;
-
-import com.springboot101.proxy.StudentDataProxy;
-import xyz.erupt.annotation.Erupt;
-import xyz.erupt.annotation.EruptField;
-import xyz.erupt.annotation.sub_erupt.Power;
-import xyz.erupt.annotation.sub_field.Edit;
-import xyz.erupt.annotation.sub_field.View;
-import xyz.erupt.annotation.sub_field.sub_edit.BoolType;
-import xyz.erupt.annotation.sub_field.sub_edit.Search;
-import xyz.erupt.jpa.model.BaseModel;
-
-import javax.persistence.*;
-
-/*
- * @Erupt注解修饰在类上，@EruptField注解修饰在字段上
- * 其他注解均为Jpa注解
- */
-@Erupt(name = "学生表",dataProxy = {StudentDataProxy.class},
- power = @Power(importable = true, export = true)
-)
-@Entity
-//@Table(name = "t_student")
-public class Student extends BaseModel {
-
- @EruptField(
- views = @View(title = "学生姓名"),
- edit = @Edit(title = "学生姓名", notNull = true, search = @Search(vague = true))
- )
- private String studentName;
-
- @EruptField(
- views = @View(title = "所属班级"),
- edit = @Edit(title = "所属班级", notNull = true)
- )
- private String studentClass;
-
- @EruptField(
- views = @View(title = "学生年龄"),
- edit = @Edit(title = "学生年龄", notNull = true)
- )
- private String studentAge;
-
- @Lob
- @EruptField(
- views = @View(title = "学生性别"),
- edit = @Edit(title = "学生性别", notNull = true)
- )
- private String studentSex;
-
- @EruptField(
- views = @View(title = "考核状态"),
- edit = @Edit(title = "考核状态", notNull = true, boolType = @BoolType(trueText = "通过", falseText = "挂科"), search = @Search)
- )
- private Boolean status;
-
- public String getStudentName() {
- return studentName;
- }
-
- public void setStudentName(String studentName) {
- this.studentName = studentName;
- }
-
- public String getStudentClass() {
- return studentClass;
- }
-
- public void setStudentClass(String studentClass) {
- this.studentClass = studentClass;
- }
-
- public String getStudentAge() {
- return studentAge;
- }
-
- public void setStudentAge(String studentAge) {
- this.studentAge = studentAge;
- }
-
- public String getStudentSex() {
- return studentSex;
- }
-
- public void setStudentSex(String studentSex) {
- this.studentSex = studentSex;
- }
-
- public Boolean getStatus() {
- return status;
- }
-
- public void setStatus(Boolean status) {
- this.status = status;
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/java/com/springboot101/proxy/StudentDataProxy.java" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/java/com/springboot101/proxy/StudentDataProxy.java"
deleted file mode 100644
index 083c6c25..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/java/com/springboot101/proxy/StudentDataProxy.java"
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.springboot101.proxy;
-
-import com.springboot101.model.Student;
-import org.apache.poi.ss.usermodel.Workbook;
-import xyz.erupt.annotation.fun.DataProxy;
-import xyz.erupt.core.exception.EruptApiErrorTip;
-import xyz.erupt.jpa.dao.EruptDao;
-import xyz.erupt.jpa.dao.EruptJpaDao;
-
-import java.util.Collection;
-import java.util.Map;
-
-public class StudentDataProxy implements DataProxy {
-
- private EruptDao eruptDao;
-
- private EruptJpaDao eruptJpaDao;
-
- @Override
- public void beforeAdd(Student student) {
-
- //后台字段校验
- if ("张三".equals(student.getStudentName())) {
- throw new EruptApiErrorTip("名称禁止为张三！");
- }
- }
-
- @Override
- public void afterAdd(Student student) {
-
- }
-
- @Override
- public void afterUpdate(Student student) {
-
- }
-
- @Override
- public void afterDelete(Student student) {
- }
-
-
- @Override
- public void beforeUpdate(Student student) {
-
- }
-
- @Override
- public void beforeDelete(Student student) {
-
- }
-
- @Override
- public String beforeFetch() {
- return null;
- }
-
- @Override
- public void afterFetch(Collection> list) {
-
- }
-
- @Override
- public void addBehavior(Student student) {
-
- }
-
- @Override
- public void editBehavior(Student student) {
-
- }
-
- @Override
- public void excelExport(Workbook wb) {
-
- }
-
- @Override
- public void excelImport(Student student) {
-
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/application.yml" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/application.yml"
deleted file mode 100644
index 566b95cf..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/application.yml"
+++ /dev/null
@@ -1,22 +0,0 @@
-spring:
- datasource:
- url: jdbc:mysql://127.0.0.1:3306/erupt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
- username: root
- password: 123456
- jpa:
- show-sql: true
- generate-ddl: true
- database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
- database: mysql
- profiles:
- active: dev
- mail:
- username: xxxx@qq.com
- password: xxxxxxx
- host: smtp.qq.com
- properties:
- mail.smtp.ssl.auth: true
- mail.smtp.ssl.enable: true
- mail.smtp.ssl.required: true
-server:
- port: 8888
\ No newline at end of file
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/public/app.css" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/public/app.css"
deleted file mode 100644
index a994b3f6..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/public/app.css"
+++ /dev/null
@@ -1,20 +0,0 @@
-/* 例：修改登录页样式 */
-layout-passport > .container {
- background-position: center !important;
- background-repeat: repeat !important;
- background-size: cover !important;
- background-color: #fff !important;
- background-image: url(https://www.erupt.xyz/demo/login-bg.svg) !important;
-}
-
-layout-passport .title {
- font-family: Courier New, Menlo, Monaco, Consolas, monospace !important;
-}
-
-layout-passport form {
- padding: 26px !important;
- margin: 8px !important;
- background: rgba(255, 255, 255, 0.9);
- border-radius: 3px;
- box-shadow: 1px 1px 10px rgba(190, 184, 184, 0.3);
-}
\ No newline at end of file
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/public/app.js" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/public/app.js"
deleted file mode 100644
index d74a7875..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/public/app.js"
+++ /dev/null
@@ -1,19 +0,0 @@
-//如果修改后不生效请清除浏览器缓存后刷新重试
-window.eruptSiteConfig = {
- //erupt接口地址，在前后端分离时指定
- domain: "",
- //附件地址，一般情况下不需要指定，如果自定义对象存储空间，则需在此指定附件资源访问地址
- fileDomain: "",
- //标题
- title: "吹爆小富云平台",
- //描述
- desc: "颜值不足 100 请自动退下",
- //高德地图api key,使用地图组件须指定此属性，amapKey获取地址：https://lbs.amap.com
- amapKey: "6ba79a8d6ba79a8d",
- //logo路径
- logoPath: "erupt.svg",
- //logo文字
- logoText: "fire",
- //是否开启路由复用
- routerReuse: true,
-};
\ No newline at end of file
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/public/home.html" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/public/home.html"
deleted file mode 100644
index 1e025463..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/public/home.html"
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- home
- I'm home
-
-
\ No newline at end of file
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/public/login-img.png" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/public/login-img.png"
deleted file mode 100644
index 246d878b..00000000
Binary files "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/public/login-img.png" and /dev/null differ
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/tpl/erupt.html" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/tpl/erupt.html"
deleted file mode 100644
index f956cebd..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-erupt/src/main/resources/tpl/erupt.html"
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
- Title
-
-
-Hello erupt-tpl
-
-
\ No newline at end of file
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/README.md" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/README.md"
deleted file mode 100644
index 30a477ab..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/README.md"
+++ /dev/null
@@ -1,7 +0,0 @@
-### magic-api
-
-springboot集成magic-api实现API接口的快速开发
-
-无需按照JAVA开发规范，定义一系列controller、service、vo、dto等类
-
-提供可视化操作界面编辑API接口逻辑
\ No newline at end of file
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/pom.xml" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/pom.xml"
deleted file mode 100644
index 77e9270d..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/pom.xml"
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
- springboot-magic-api
- 0.0.1-SNAPSHOT
-
-
- 8
- 8
-
-
-
-
-
-
- org.ssssssss
- magic-api-spring-boot-starter
- 0.7.1
-
-
-
- com.dtflys.forest
- spring-boot-starter-forest
- 1.5.0-RC3
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/src/main/java/com/springboot101/SpringbootMagicApiApplication.java" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/src/main/java/com/springboot101/SpringbootMagicApiApplication.java"
deleted file mode 100644
index ce8fc6b0..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/src/main/java/com/springboot101/SpringbootMagicApiApplication.java"
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class SpringbootMagicApiApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(SpringbootMagicApiApplication.class, args);
- }
-
-}
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/src/main/resources/application.yml" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/src/main/resources/application.yml"
deleted file mode 100644
index ed0f99e6..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/src/main/resources/application.yml"
+++ /dev/null
@@ -1,54 +0,0 @@
-magic-api:
- web: /magic/web # UI请求的界面以及UI服务地址
- resource: #配置存储方式
- type: database # 配置存储在数据库中
- tableName: magic_api_file # 数据库中的表名
- datasource: jdbc:mysql://47.93.6.5:3306/magic-api?useUnicode=true&characterEncoding=UTF-8&useSSL=false
- #指定数据源（单数据源时无需配置，多数据源时默认使用主数据源，如果存在其他数据源中需要指定。）
- prefix: /magic-api # key前缀
- readonly: false # 是否是只读模式
-# prefix: / # 接口前缀，可以不配置
-# auto-import-module: db # 自动导入的模块
-# auto-import-package: java.lang.*,java.util.* #自动导包
-# refresh-interval: 0 #不启用刷新
-# allow-override: false #禁止覆盖应用接口
-# sql-column-case: camel #启用驼峰命名转换
-# editor-config: classpath:./magic-editor-config.js #编辑器配置
-# support-cross-domain: true # 跨域支持，默认开启
-# response: |- #配置JSON格式，格式为magic-script中的表达式
-# {
-# code: code,
-# message: message,
-# data,
-# timestamp,
-# requestTime,
-# executeTime,
-# }
-# banner: true # 打印banner
-# thread-pool-executor-size: 8 # async语句的线程池大小
-# throw-exception: false #执行出错时是否抛出异常
-# page-config:
-# size: size # 页大小的参数名称
-# page: page # 页码的参数名称
-# default-page: 1 # 未传页码时的默认首页
-# default-size: 10 # 未传页大小时的默认页大小
-# security-config: # 安全配置
-# username: admin # 登录用的用户名
-# password: 123456 # 登录用的密码
-# swagger-config:
-# version: 1.0
-# description: MagicAPI 接口信息
-# title: MagicAPI Swagger Docs
-# name: MagicAPI 接口
-# location: /v2/api-docs/magic-api/swagger2.json
-# debug-config:
-# timeout: 60 # 断点超时时间，默认60s
-
-server:
- port: 9999
-spring:
- datasource:
- driver-class-name: com.mysql.jdbc.Driver
- password: 123456
- url: jdbc:mysql://47.93.6.5:3306/magic-api?useUnicode=true&characterEncoding=UTF-8&useSSL=false
- username: root
diff --git "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/src/test/java/com/xiaofu/magic/SpringbootMagicApiApplicationTests.java" "b/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/src/test/java/com/xiaofu/magic/SpringbootMagicApiApplicationTests.java"
deleted file mode 100644
index a7509af1..00000000
--- "a/springboot101/\344\275\216\344\273\243\347\240\201/springboot-magic-api/src/test/java/com/xiaofu/magic/SpringbootMagicApiApplicationTests.java"
+++ /dev/null
@@ -1,13 +0,0 @@
-//package com.springboot101.magic;
-//
-//import org.junit.jupiter.api.Test;
-//import org.springframework.boot.test.context.SpringBootTest;
-//
-//@SpringBootTest
-//class SpringbootMagicApiApplicationTests {
-//
-// @Test
-// void contextLoads() {
-// }
-//
-//}
diff --git "a/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/.gitignore" "b/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/.gitignore"
deleted file mode 100644
index 50ba3ac5..00000000
--- "a/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/.gitignore"
+++ /dev/null
@@ -1,38 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-!/mvnw
-!/mvnw.cmd
-!/mvnw
-
-!/mvnw.cmd
diff --git "a/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/README.md" "b/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/README.md"
deleted file mode 100644
index dbe6cb8e..00000000
--- "a/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/README.md"
+++ /dev/null
@@ -1 +0,0 @@
-抖音去水印工具
\ No newline at end of file
diff --git "a/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/pom.xml" "b/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/pom.xml"
deleted file mode 100644
index e723a885..00000000
--- "a/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/pom.xml"
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
- springboot-douyin-watermark
- 0.0.1-SNAPSHOT
- springboot-douyin-watermark
-
-
diff --git "a/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/src/main/resources/application.properties" "b/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/src/main/resources/application.properties"
deleted file mode 100644
index 2c5fdc35..00000000
--- "a/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/src/main/resources/application.properties"
+++ /dev/null
@@ -1 +0,0 @@
-server.port=9999
diff --git "a/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/src/main/resources/static/js/vue.min.js" "b/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/src/main/resources/static/js/vue.min.js"
deleted file mode 100644
index 4d6dad39..00000000
--- "a/springboot101/\345\216\273\346\260\264\345\215\260/springboot-douyin-watermark/src/main/resources/static/js/vue.min.js"
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * Vue.js v2.1.6
- * (c) 2014-2016 Evan You
- * Released under the MIT License.
- */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.Vue=t()}(this,function(){"use strict";function e(e){return null==e?"":"object"==typeof e?JSON.stringify(e,null,2):String(e)}function t(e){var t=parseFloat(e,10);return t||0===t?t:e}function n(e,t){for(var n=Object.create(null),r=e.split(","),i=0;i-1)return e.splice(n,1)}}function i(e,t){return Yr.call(e,t)}function a(e){return"string"==typeof e||"number"==typeof e}function o(e){var t=Object.create(null);return function(n){var r=t[n];return r||(t[n]=e(n))}}function s(e,t){function n(n){var r=arguments.length;return r?r>1?e.apply(t,arguments):e.call(t,n):e.call(t)}return n._length=e.length,n}function c(e,t){t=t||0;for(var n=e.length-t,r=new Array(n);n--;)r[n]=e[n+t];return r}function l(e,t){for(var n in t)e[n]=t[n];return e}function u(e){return null!==e&&"object"==typeof e}function f(e){return ri.call(e)===ii}function d(e){for(var t={},n=0;n=0&&Li[n].id>e.id;)n--;Li.splice(Math.max(n,Ri)+1,0,e)}else Li.push(e);Mi||(Mi=!0,_i(B))}}function V(e){Ui.clear(),J(e,Ui)}function J(e,t){var n,r,i=Array.isArray(e);if((i||u(e))&&Object.isExtensible(e)){if(e.__ob__){var a=e.__ob__.dep.id;if(t.has(a))return;t.add(a)}if(i)for(n=e.length;n--;)J(e[n],t);else for(r=Object.keys(e),n=r.length;n--;)J(e[r[n]],t)}}function K(e){e._watchers=[];var t=e.$options;t.props&&q(e,t.props),t.methods&&Y(e,t.methods),t.data?W(e):k(e._data={},!0),t.computed&&Z(e,t.computed),t.watch&&Q(e,t.watch)}function q(e,t){var n=e.$options.propsData||{},r=e.$options._propKeys=Object.keys(t),i=!e.$parent;Si.shouldConvert=i;for(var a=function(i){var a=r[i];A(e,a,R(a,t,n,e))},o=0;o1?c(n):n;for(var r=c(arguments,1),i=0,a=n.length;i-1:e.test(t)}function qe(e){var t={};t.get=function(){return si},Object.defineProperty(e,"config",t),e.util=Ni,e.set=O,e.delete=S,e.nextTick=_i,e.options=Object.create(null),si._assetTypes.forEach(function(t){e.options[t+"s"]=Object.create(null)}),e.options._base=e,l(e.options.components,Yi),Be(e),ze(e),Ve(e),Je(e)}function We(e){for(var t=e.data,n=e,r=e;r.child;)r=r.child._vnode,r.data&&(t=Ze(r.data,t));for(;n=n.parent;)n.data&&(t=Ze(t,n.data));return Ge(t)}function Ze(e,t){return{staticClass:Ye(e.staticClass,t.staticClass),class:e.class?[e.class,t.class]:t.class}}function Ge(e){var t=e.class,n=e.staticClass;return n||t?Ye(n,Qe(t)):""}function Ye(e,t){return e?t?e+" "+t:e:t||""}function Qe(e){var t="";if(!e)return t;if("string"==typeof e)return e;if(Array.isArray(e)){for(var n,r=0,i=e.length;r-1?pa[e]=t.constructor===window.HTMLUnknownElement||t.constructor===window.HTMLElement:pa[e]=/HTMLUnknownElement/.test(t.toString())}function tt(e){if("string"==typeof e){if(e=document.querySelector(e),!e)return document.createElement("div")}return e}function nt(e,t){var n=document.createElement(e);return"select"!==e?n:(t.data&&t.data.attrs&&"multiple"in t.data.attrs&&n.setAttribute("multiple","multiple"),n)}function rt(e,t){return document.createElementNS(ca[e],t)}function it(e){return document.createTextNode(e)}function at(e){return document.createComment(e)}function ot(e,t,n){e.insertBefore(t,n)}function st(e,t){e.removeChild(t)}function ct(e,t){e.appendChild(t)}function lt(e){return e.parentNode}function ut(e){return e.nextSibling}function ft(e){return e.tagName}function dt(e,t){e.textContent=t}function pt(e,t,n){e.setAttribute(t,n)}function vt(e,t){var n=e.data.ref;if(n){var i=e.context,a=e.child||e.elm,o=i.$refs;t?Array.isArray(o[n])?r(o[n],a):o[n]===a&&(o[n]=void 0):e.data.refInFor?Array.isArray(o[n])&&o[n].indexOf(a)<0?o[n].push(a):o[n]=[a]:o[n]=a}}function ht(e){return null==e}function mt(e){return null!=e}function gt(e,t){return e.key===t.key&&e.tag===t.tag&&e.isComment===t.isComment&&!e.data==!t.data}function yt(e,t,n){var r,i,a={};for(r=t;r<=n;++r)i=e[r].key,mt(i)&&(a[i]=r);return a}function _t(e){function t(e){return new zi(O.tagName(e).toLowerCase(),{},[],void 0,e)}function r(e,t){function n(){0===--n.listeners&&i(e)}return n.listeners=t,n}function i(e){var t=O.parentNode(e);t&&O.removeChild(t,e)}function o(e,t,n,r,i){if(e.isRootInsert=!i,!s(e,t,n,r)){var a=e.data,o=e.children,c=e.tag;mt(c)?(e.elm=e.ns?O.createElementNS(e.ns,c):O.createElement(c,e),v(e),u(e,o,t),mt(a)&&d(e,t),l(n,e.elm,r)):e.isComment?(e.elm=O.createComment(e.text),l(n,e.elm,r)):(e.elm=O.createTextNode(e.text),l(n,e.elm,r))}}function s(e,t,n,r){var i=e.data;if(mt(i)){var a=mt(e.child)&&i.keepAlive;if(mt(i=i.hook)&&mt(i=i.init)&&i(e,!1,n,r),mt(e.child))return p(e,t),a&&c(e,t,n,r),!0}}function c(e,t,n,r){for(var i,a=e;a.child;)if(a=a.child._vnode,mt(i=a.data)&&mt(i=i.transition)){for(i=0;id?(l=ht(n[m+1])?null:n[m+1].elm,h(e,l,n,f,m,r)):f>m&&g(e,t,u,d)}function b(e,t,n,r){if(e!==t){if(t.isStatic&&e.isStatic&&t.key===e.key&&(t.isCloned||t.isOnce))return t.elm=e.elm,void(t.child=e.child);var i,a=t.data,o=mt(a);o&&mt(i=a.hook)&&mt(i=i.prepatch)&&i(e,t);var s=t.elm=e.elm,c=e.children,l=t.children;if(o&&f(t)){for(i=0;i-1?t.split(/\s+/).forEach(function(t){return e.classList.add(t)}):e.classList.add(t);else{var n=" "+e.getAttribute("class")+" ";n.indexOf(" "+t+" ")<0&&e.setAttribute("class",(n+t).trim())}}function It(e,t){if(t&&t.trim())if(e.classList)t.indexOf(" ")>-1?t.split(/\s+/).forEach(function(t){return e.classList.remove(t)}):e.classList.remove(t);else{for(var n=" "+e.getAttribute("class")+" ",r=" "+t+" ";n.indexOf(r)>=0;)n=n.replace(r," ");e.setAttribute("class",n.trim())}}function Ft(e){Fa(function(){Fa(e)})}function Ht(e,t){(e._transitionClasses||(e._transitionClasses=[])).push(t),Rt(e,t)}function Ut(e,t){e._transitionClasses&&r(e._transitionClasses,t),It(e,t)}function Bt(e,t,n){var r=zt(e,t),i=r.type,a=r.timeout,o=r.propCount;if(!i)return n();var s=i===La?Pa:Ia,c=0,l=function(){e.removeEventListener(s,u),n()},u=function(t){t.target===e&&++c>=o&&l()};setTimeout(function(){c0&&(n=La,u=o,f=a.length):t===Da?l>0&&(n=Da,u=l,f=c.length):(u=Math.max(o,l),n=u>0?o>l?La:Da:null,f=n?n===La?a.length:c.length:0);var d=n===La&&Ha.test(r[Ma+"Property"]);return{type:n,timeout:u,propCount:f,hasTransform:d}}function Vt(e,t){for(;e.length1,T=n._enterCb=Zt(function(){O&&Ut(n,w),T.cancelled?(O&&Ut(n,$),
-A&&A(n)):k&&k(n),n._enterCb=null});e.data.show||ae(e.data.hook||(e.data.hook={}),"insert",function(){var t=n.parentNode,r=t&&t._pending&&t._pending[e.key];r&&r.context===e.context&&r.tag===e.tag&&r.elm._leaveCb&&r.elm._leaveCb(),C&&C(n,T)},"transition-insert"),x&&x(n),O&&(Ht(n,$),Ht(n,w),Ft(function(){Ut(n,$),T.cancelled||S||Bt(n,a,T)})),e.data.show&&(t&&t(),C&&C(n,T)),O||S||T()}}}function qt(e,t){function n(){m.cancelled||(e.data.show||((r.parentNode._pending||(r.parentNode._pending={}))[e.key]=e),l&&l(r),v&&(Ht(r,s),Ht(r,c),Ft(function(){Ut(r,s),m.cancelled||h||Bt(r,o,m)})),u&&u(r,m),v||h||m())}var r=e.elm;r._enterCb&&(r._enterCb.cancelled=!0,r._enterCb());var i=Wt(e.data.transition);if(!i)return t();if(!r._leaveCb&&1===r.nodeType){var a=i.css,o=i.type,s=i.leaveClass,c=i.leaveActiveClass,l=i.beforeLeave,u=i.leave,f=i.afterLeave,d=i.leaveCancelled,p=i.delayLeave,v=a!==!1&&!pi,h=u&&(u._length||u.length)>1,m=r._leaveCb=Zt(function(){r.parentNode&&r.parentNode._pending&&(r.parentNode._pending[e.key]=null),v&&Ut(r,c),m.cancelled?(v&&Ut(r,s),d&&d(r)):(t(),f&&f(r)),r._leaveCb=null});p?p(n):n()}}function Wt(e){if(e){if("object"==typeof e){var t={};return e.css!==!1&&l(t,Ua(e.name||"v")),l(t,e),t}return"string"==typeof e?Ua(e):void 0}}function Zt(e){var t=!1;return function(){t||(t=!0,e())}}function Gt(e,t){t.data.show||Kt(t)}function Yt(e,t,n){var r=t.value,i=e.multiple;if(!i||Array.isArray(r)){for(var a,o,s=0,c=e.options.length;s-1,o.selected!==a&&(o.selected=a);else if(h(Xt(o),r))return void(e.selectedIndex!==s&&(e.selectedIndex=s));i||(e.selectedIndex=-1)}}function Qt(e,t){for(var n=0,r=t.length;n',n.innerHTML.indexOf(t)>0}function pn(e){return eo=eo||document.createElement("div"),eo.innerHTML=e,eo.textContent}function vn(e,t){return t&&(e=e.replace(Zo,"\n")),e.replace(qo,"<").replace(Wo,">").replace(Go,"&").replace(Yo,'"')}function hn(e,t){function n(t){f+=t,e=e.substring(t)}function r(){var t=e.match(fo);if(t){var r={tagName:t[1],attrs:[],start:f};n(t[0].length);for(var i,a;!(i=e.match(po))&&(a=e.match(co));)n(a[0].length),r.attrs.push(a);if(i)return r.unarySlash=i[1],n(i[0].length),r.end=f,r}}function i(e){var n=e.tagName,r=e.unarySlash;l&&("p"===s&&io(n)&&a("",s),ro(n)&&s===n&&a("",n));for(var i=u(n)||"html"===n&&"head"===s||!!r,o=e.attrs.length,f=new Array(o),d=0;d=0&&c[a].tag.toLowerCase()!==o;a--);}else a=0;if(a>=0){for(var l=c.length-1;l>=a;l--)t.end&&t.end(c[l].tag,r,i);c.length=a,s=a&&c[a-1].tag}else"br"===n.toLowerCase()?t.start&&t.start(n,[],!0,r,i):"p"===n.toLowerCase()&&(t.start&&t.start(n,[],!1,r,i),t.end&&t.end(n,r,i))}for(var o,s,c=[],l=t.expectHTML,u=t.isUnaryTag||ai,f=0;e;){if(o=e,s&&Jo(s,t.sfc,c)){var d=s.toLowerCase(),p=Ko[d]||(Ko[d]=new RegExp("([\\s\\S]*?)(]*>)","i")),v=0,h=e.replace(p,function(e,n,r){return v=r.length,"script"!==d&&"style"!==d&&"noscript"!==d&&(n=n.replace(//g,"$1").replace(//g,"$1")),t.chars&&t.chars(n),""});f+=e.length-h.length,e=h,a("",d,f-v,f)}else{var m=e.indexOf("<");if(0===m){if(mo.test(e)){var g=e.indexOf("-->");if(g>=0){n(g+3);continue}}if(go.test(e)){var y=e.indexOf("]>");if(y>=0){n(y+2);continue}}var _=e.match(ho);if(_){n(_[0].length);continue}var b=e.match(vo);if(b){var $=f;n(b[0].length),a(b[0],b[1],$,f);continue}var w=r();if(w){i(w);continue}}var x=void 0,C=void 0,k=void 0;if(m>0){for(C=e.slice(m);!(vo.test(C)||fo.test(C)||mo.test(C)||go.test(C)||(k=C.indexOf("<",1),k<0));)m+=k,C=e.slice(m);x=e.substring(0,m),n(m)}m<0&&(x=e,e=""),t.chars&&x&&t.chars(x)}if(e===o&&t.chars){t.chars(e);break}}a()}function mn(e){function t(){(o||(o=[])).push(e.slice(v,i).trim()),v=i+1}var n,r,i,a,o,s=!1,c=!1,l=!1,u=!1,f=0,d=0,p=0,v=0;for(i=0;i=0&&(m=e.charAt(h)," "===m);h--);m&&/[\w$]/.test(m)||(u=!0)}}else void 0===a?(v=i+1,a=e.slice(0,i).trim()):t();if(void 0===a?a=e.slice(0,i).trim():0!==v&&t(),o)for(i=0;io&&a.push(JSON.stringify(e.slice(o,i)));var s=mn(r[1].trim());a.push("_s("+s+")"),o=i+r[0].length}return o=_o}function En(e){return 34===e||39===e}function jn(e){var t=1;for(xo=wo;!Tn();)if(e=Sn(),En(e))Nn(e);else if(91===e&&t++,93===e&&t--,0===t){Co=wo;break}}function Nn(e){for(var t=e;!Tn()&&(e=Sn(),e!==t););}function Ln(e,t){ko=t.warn||_n,Ao=t.getTagNamespace||ai,Oo=t.mustUseProp||ai,So=t.isPreTag||ai,To=bn(t.modules,"preTransformNode"),Eo=bn(t.modules,"transformNode"),jo=bn(t.modules,"postTransformNode"),No=t.delimiters;var n,r,i=[],a=t.preserveWhitespace!==!1,o=!1,s=!1;return hn(e,{expectHTML:t.expectHTML,isUnaryTag:t.isUnaryTag,shouldDecodeNewlines:t.shouldDecodeNewlines,start:function(e,a,c){function l(e){}var u=r&&r.ns||Ao(e);di&&"svg"===u&&(a=Yn(a));var f={type:1,tag:e,attrsList:a,attrsMap:Wn(a),parent:r,children:[]};u&&(f.ns=u),Gn(f)&&!gi()&&(f.forbidden=!0);for(var d=0;d-1:_q("+t+","+a+")"),Cn(e,"change","var $$a="+t+",$$el=$event.target,$$c=$$el.checked?("+a+"):("+o+");if(Array.isArray($$a)){var $$v="+(r?"_n("+i+")":i)+",$$i=_i($$a,$$v);if($$c){$$i<0&&("+t+"=$$a.concat($$v))}else{$$i>-1&&("+t+"=$$a.slice(0,$$i).concat($$a.slice($$i+1)))}}else{"+t+"=$$c}",null,!0)}function Ir(e,t,n){var r=n&&n.number,i=kn(e,"value")||"null";i=r?"_n("+i+")":i,$n(e,"checked","_q("+t+","+i+")"),Cn(e,"change",Ur(t,i),null,!0)}function Fr(e,t,n){var r=e.attrsMap.type,i=n||{},a=i.lazy,o=i.number,s=i.trim,c=a||di&&"range"===r?"change":"input",l=!a&&"range"!==r,u="input"===e.tag||"textarea"===e.tag,f=u?"$event.target.value"+(s?".trim()":""):s?"(typeof $event === 'string' ? $event.trim() : $event)":"$event";f=o||"number"===r?"_n("+f+")":f;var d=Ur(t,f);u&&l&&(d="if($event.target.composing)return;"+d),$n(e,"value",u?"_s("+t+")":"("+t+")"),Cn(e,c,d,null,!0),(s||o||"number"===r)&&Cn(e,"blur","$forceUpdate()")}function Hr(e,t,n){var r=n&&n.number,i='Array.prototype.filter.call($event.target.options,function(o){return o.selected}).mapper(function(o){var val = "_value" in o ? o._value : o.value;return '+(r?"_n(val)":"val")+"})"+(null==e.attrsMap.multiple?"[0]":""),a=Ur(t,i);Cn(e,"change",a,null,!0)}function Ur(e,t){var n=On(e);return null===n.idx?e+"="+t:"var $$exp = "+n.exp+", $$idx = "+n.idx+";if (!Array.isArray($$exp)){"+e+"="+t+"}else{$$exp.splice($$idx, 1, "+t+")}"}function Br(e,t){t.value&&$n(e,"textContent","_s("+t.value+")")}function zr(e,t){t.value&&$n(e,"innerHTML","_s("+t.value+")")}function Vr(e,t){return t=t?l(l({},ws),t):ws,jr(e,t)}function Jr(e,t,n){var r=(t&&t.warn||$i,t&&t.delimiters?String(t.delimiters)+e:e);if($s[r])return $s[r];var i={},a=Vr(e,t);i.render=Kr(a.render);var o=a.staticRenderFns.length;i.staticRenderFns=new Array(o);for(var s=0;s0,vi=fi&&fi.indexOf("edge/")>0,hi=fi&&fi.indexOf("android")>0,mi=fi&&/iphone|ipad|ipod|ios/.test(fi),gi=function(){return void 0===Wr&&(Wr=!ui&&"undefined"!=typeof global&&"server"===global.process.env.VUE_ENV),Wr},yi=ui&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__,_i=function(){function e(){r=!1;var e=n.slice(0);n.length=0;for(var t=0;t1&&(t[n[0].trim()]=n[1].trim())}}),t}),Aa=/^--/,Oa=/\s*!important$/,Sa=function(e,t,n){Aa.test(t)?e.style.setProperty(t,n):Oa.test(n)?e.style.setProperty(t,n.replace(Oa,""),"important"):e.style[Ea(t)]=n},Ta=["Webkit","Moz","ms"],Ea=o(function(e){if(Xi=Xi||document.createElement("div"),e=Xr(e),"filter"!==e&&e in Xi.style)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=0;n\/=]+)/,oo=/(?:=)/,so=[/"([^"]*)"+/.source,/'([^']*)'+/.source,/([^\s"'=<>`]+)/.source],co=new RegExp("^\\s*"+ao.source+"(?:\\s*("+oo.source+")\\s*(?:"+so.join("|")+"))?"),lo="[a-zA-Z_][\\w\\-\\.]*",uo="((?:"+lo+"\\:)?"+lo+")",fo=new RegExp("^<"+uo),po=/^\s*(\/?)>/,vo=new RegExp("^<\\/"+uo+"[^>]*>"),ho=/^]+>/i,mo=/^
-
- org.springframework.integration
- spring-integration-mqtt
-
-
- org.eclipse.paho
- org.eclipse.paho.client.mqttv3
- [1.2.1,)
-
-
- cn.hutool
- hutool-all
- 5.5.8
- compile
-
-
- com.squareup.okhttp3
- okhttp
- 4.9.0
- compile
-
-
-
-
-
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/SpringbootRealTimeApplication.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/SpringbootRealTimeApplication.java"
deleted file mode 100644
index 50a4bfb6..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/SpringbootRealTimeApplication.java"
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.web.socket.config.annotation.EnableWebSocket;
-
-@EnableWebSocket
-@EnableAsync
-@SpringBootApplication
-public class SpringbootRealTimeApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(SpringbootRealTimeApplication.class, args);
- }
-}
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/config/IotMqttProducerConfig.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/config/IotMqttProducerConfig.java"
deleted file mode 100644
index 61f056a0..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/config/IotMqttProducerConfig.java"
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.springboot101.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.integration.annotation.ServiceActivator;
-import org.springframework.integration.channel.DirectChannel;
-import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
-import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
-import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
-import org.springframework.messaging.MessageChannel;
-import org.springframework.messaging.MessageHandler;
-
-/**
- * @Author: 程序员小富
- * @Description:
- */
-@Configuration
-public class IotMqttProducerConfig {
-
- @Autowired
- private MqttConfig mqttConfig;
-
- @Bean
- public MqttPahoClientFactory mqttClientFactory() {
- DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
- // 如果需要使用此案例打开服务地址注入
-// factory.setServerURIs(mqttConfig.getServers());
-// MqttConnectOptions mqttConnectOptions = new MqttConnectOptions();
-// mqttConnectOptions.setServerURIs(new String[Integer.parseInt(mqttConfig.getServers())]);
-// factory.setConnectionOptions(mqttConnectOptions);
- return factory;
- }
-
- @Bean
- public MessageChannel iotMqttInputChannel() {
- return new DirectChannel();
- }
-
- @Bean
- @ServiceActivator(inputChannel = "iotMqttInputChannel")
- public MessageHandler mqttOutbound() {
- MqttPahoMessageHandler messageHandler = new MqttPahoMessageHandler(mqttConfig.getServerClientId(), mqttClientFactory());
- messageHandler.setAsync(false);
- messageHandler.setDefaultQos(2);
- messageHandler.setDefaultTopic(mqttConfig.getDefaultTopic());
- return messageHandler;
- }
-}
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/config/IotMqttSubscriberConfig.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/config/IotMqttSubscriberConfig.java"
deleted file mode 100644
index eec12a8f..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/config/IotMqttSubscriberConfig.java"
+++ /dev/null
@@ -1,71 +0,0 @@
-//package com.mqtt.config;
-//
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.integration.annotation.ServiceActivator;
-//import org.springframework.integration.channel.DirectChannel;
-//import org.springframework.integration.core.MessageProducer;
-//import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
-//import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
-//import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
-//import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
-//import org.springframework.messaging.MessageChannel;
-//import org.springframework.messaging.MessageHandler;
-//import org.springframework.messaging.MessagingException;
-//
-///**
-// * @Author: 公众号：程序员小富
-// * @Description: 消息订阅配置
-// * @date 2020/6/8 18:24
-// */
-//@Configuration
-//public class IotMqttSubscriberConfig {
-//
-// @Autowired
-// private MqttConfig mqttConfig;
-//
-// @Bean
-// public MqttPahoClientFactory mqttClientFactory() {
-// DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
-// factory.setServerURIs(mqttConfig.getServers());
-// return factory;
-// }
-//
-// @Bean
-// public MessageChannel iotMqttInputChannel() {
-// return new DirectChannel();
-// }
-//
-// @Bean
-// public MessageProducer inbound() {
-// MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter(mqttConfig.getClientId(), mqttClientFactory(), mqttConfig.getDefaultTopic());
-// adapter.setCompletionTimeout(5000);
-// adapter.setConverter(new DefaultPahoMessageConverter());
-// adapter.setQos(2);
-// adapter.setOutputChannel(iotMqttInputChannel());
-// return adapter;
-// }
-//
-// /**
-// * @author 公众号：程序员小富
-// * @description 消息订阅
-// * @date 2020/6/8 18:20
-// */
-// @Bean
-// @ServiceActivator(inputChannel = "iotMqttInputChannel")
-// public MessageHandler handlerTest() {
-//
-// return message -> {
-// try {
-// String string = message.getPayload().toString();
-// System.out.println("接收到消息：" + string);
-// } catch (MessagingException ex) {
-// //logger.info(ex.getMessage());
-// }
-// };
-//
-// }
-//}
-//
-//
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/config/MqttConfig.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/config/MqttConfig.java"
deleted file mode 100644
index 128f8eb4..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/config/MqttConfig.java"
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.springboot101.config;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.integration.annotation.IntegrationComponentScan;
-import org.springframework.stereotype.Component;
-
-/**
- * @Author: 程序员小富
- * @Description: 基础配置类
- * @date 2020/6/8 18:25
- */
-@Getter
-@Setter
-@Component
-@IntegrationComponentScan
-@ConfigurationProperties(prefix = "iot.mqtt")
-public class MqttConfig {
-
- /**
- * 服务地址
- */
- private String servers;
-
- /**
- * 客户端id
- */
- private String clientId;
-
- /**
- * 服务端id
- */
- private String serverClientId;
-
- /**
- * 默认主题
- */
- private String defaultTopic;
-}
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/iframe/IframeController.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/iframe/IframeController.java"
deleted file mode 100644
index 6f9bfaf0..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/iframe/IframeController.java"
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.springboot101.controller.iframe;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicInteger;
-
-@CrossOrigin("*")
-@Controller
-@RequestMapping("/iframe")
-public class IframeController {
-
- private AtomicInteger count = new AtomicInteger();
-
- /**
- * iframe 页面
- */
- @RequestMapping("/index")
- public String sse() {
- return "iframe";
- }
-
- @GetMapping(path = "message")
- public void message(HttpServletResponse response) throws IOException, InterruptedException {
- while (true) {
- count.incrementAndGet();
- response.setHeader("Pragma", "no-cache");
- response.setDateHeader("Expires", 0);
- response.setHeader("Cache-Control", "no-cache,no-store");
- response.setStatus(HttpServletResponse.SC_OK);
- response.getWriter().print(" ");
- }
- }
-}
-
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/mqtt/MqttController.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/mqtt/MqttController.java"
deleted file mode 100644
index 92a24bf4..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/mqtt/MqttController.java"
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.springboot101.controller.mqtt;
-
-
-import com.springboot101.producer.IotMqttGateway;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * @Author: 公众号：程序员小富
- * @Description:
- * @date 2020/6/8 18:26
- */
-@CrossOrigin("*")
-@Controller
-@RequestMapping("mqtt")
-public class MqttController {
-
- @Autowired
- private IotMqttGateway mqttGateway;
-
- @RequestMapping("/index")
- public String index() {
- return "index";
- }
-
- @RequestMapping("/sendMessage")
- @ResponseBody
- public String sendMqtt(@RequestParam(value = "topic") String topic, @RequestParam(value = "message") String message) {
- mqttGateway.sendMessage2Mqtt(message, topic);
- return "SUCCESS";
- }
-
-
-}
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/polling/AsyncConfig.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/polling/AsyncConfig.java"
deleted file mode 100644
index 8291bebe..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/polling/AsyncConfig.java"
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.springboot101.controller.polling;
-
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * 公众号：程序员小富
- * 设置异步线程池
- */
-@Component
-public class AsyncConfig implements WebMvcConfigurer {
-
- public static final long TIME_OUT = 10000L;
-
- @Bean
- public ThreadPoolTaskExecutor workerTaskExecutor(){
- ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
- executor.setCorePoolSize(10);
- executor.setMaxPoolSize(25);
- executor.setQueueCapacity(100);
- return executor;
- }
-
- @Override
- public void configureAsyncSupport(AsyncSupportConfigurer configurer){
- configurer.setTaskExecutor(workerTaskExecutor());
- configurer.setDefaultTimeout(TIME_OUT);
- }
-}
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/polling/AsyncRequestTimeoutHandler.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/polling/AsyncRequestTimeoutHandler.java"
deleted file mode 100644
index e0d1d85e..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/polling/AsyncRequestTimeoutHandler.java"
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.springboot101.controller.polling;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.context.request.async.AsyncRequestTimeoutException;
-
-
-/**
- * 公众号：程序员小富
- * 全局捕获异步请求超时
- */
-@ControllerAdvice
-public class AsyncRequestTimeoutHandler {
-
- @ResponseStatus(HttpStatus.NOT_MODIFIED)
- @ResponseBody
- @ExceptionHandler(AsyncRequestTimeoutException.class)
- public String asyncRequestTimeoutHandler(AsyncRequestTimeoutException e) {
- System.out.println("异步请求超时");
- return "异步请求超时";
- }
-}
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/polling/PollingController.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/polling/PollingController.java"
deleted file mode 100644
index c0638e2b..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/polling/PollingController.java"
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.springboot101.controller.polling;
-
-import cn.hutool.core.date.DateUtil;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.async.AsyncRequestTimeoutException;
-import org.springframework.web.context.request.async.DeferredResult;
-
-import java.util.Collection;
-import java.util.Date;
-
-import static com.springboot101.controller.polling.AsyncConfig.TIME_OUT;
-
-@CrossOrigin("*")
-@Controller
-@RequestMapping("/polling")
-public class PollingController {
-
- // 存放监听某个Id的长轮询集合
- public static Multimap> watchRequests = Multimaps.synchronizedMultimap(HashMultimap.create());
-
- @RequestMapping("/index")
- public String sse() {
- return "polling";
- }
-
- /**
- * 公众号：程序员小富
- * 设置监听
- */
- @GetMapping(path = "watch/{id}")
- @ResponseBody
- public DeferredResult watch(@PathVariable String id) {
-
- DeferredResult deferredResult = new DeferredResult<>(TIME_OUT);
- try {
- // 异步请求完成时移除 key，防止内存溢出
- deferredResult.onCompletion(() -> {
- watchRequests.remove(id, deferredResult);
- });
- watchRequests.put(id, deferredResult);
- return deferredResult;
- } catch (AsyncRequestTimeoutException e) {
- DeferredResult stringDeferredResult = new DeferredResult<>();
- stringDeferredResult.setResult("超时了");
- return stringDeferredResult;
- }
- }
-
- /**
- * 公众号：程序员小富
- * 变更数据
- */
- @GetMapping(path = "publish/{id}")
- @ResponseBody
- public String publish(@PathVariable String id) {
-
- if (watchRequests.containsKey(id)) {
- Collection> deferredResults = watchRequests.get(id);
- for (DeferredResult deferredResult : deferredResults) {
- deferredResult.setResult("我更新了" + DateUtil.formatDate(new Date()));
- }
- }
- return "success";
- }
-}
-
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/socket/SocketOpsController.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/socket/SocketOpsController.java"
deleted file mode 100644
index 09350ca5..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/socket/SocketOpsController.java"
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.springboot101.controller.socket;
-
-import com.alibaba.fastjson.JSONObject;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-@CrossOrigin("*")
-@Controller
-@RequestMapping("/socket")
-public class SocketOpsController {
-
- @Resource
- private WebSocketServer webSocket;
-
- @RequestMapping("/index")
- public String sse() {
- return "socket";
- }
-
- /**
- * 公众号：程序员小富
- * 变更数据
- */
- @GetMapping(path = "publish")
- @ResponseBody
- public String publish(String message, String userId) {
- //创建业务消息信息
- JSONObject obj = new JSONObject();
- webSocket.sendOneMessage(userId, message);
- return "success";
- }
-}
-
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/socket/WebSocketConfig.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/socket/WebSocketConfig.java"
deleted file mode 100644
index 255ad80d..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/socket/WebSocketConfig.java"
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.springboot101.controller.socket;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.socket.server.standard.ServerEndpointExporter;
-
-/**
- * @Auther: 公众号：程序员小富
- * @Date: 2022/7/18 14:20
- * @Description:
- */
-@Configuration
-public class WebSocketConfig {
- /**
- * 这个bean会自动注册使用了@ServerEndpoint注解声明的Websocket endpoint
- */
- @Bean
- public ServerEndpointExporter serverEndpointExporter() {
- return new ServerEndpointExporter();
- }
-}
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/socket/WebSocketServer.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/socket/WebSocketServer.java"
deleted file mode 100644
index 003dc59c..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/socket/WebSocketServer.java"
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.springboot101.controller.socket;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.websocket.*;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-/**
- * @Auther: 公众号：程序员小富
- * @Date: 2022/7/18 14:15
- * @Description:
- */
-@Component
-@Slf4j
-// 接口路径 ws://localhost:7777/webSocket/userId;
-@ServerEndpoint("/websocket/{userId}")
-public class WebSocketServer {
-
- //与某个客户端的连接会话，需要通过它来给客户端发送数据
- private Session session;
-
- private static final CopyOnWriteArraySet webSockets = new CopyOnWriteArraySet<>();
-
- // 用来存在线连接数
- private static final Map sessionPool = new HashMap();
-
- /**
- * 公众号：程序员小富
- * 链接成功调用的方法
- */
- @OnOpen
- public void onOpen(Session session, @PathParam(value = "userId") String userId) {
- try {
- this.session = session;
- webSockets.add(this);
- sessionPool.put(userId, session);
- log.info("【websocket服务端】有新的连接，总数为:" + webSockets.size());
- } catch (Exception e) {
- }
- }
-
- /**
- * 公众号：程序员小富
- * 链接关闭调用的方法
- */
- @OnClose
- public void onClose() {
- try {
- webSockets.remove(this);
- log.info("【websocket服务端】连接断开，总数为:" + webSockets.size());
- } catch (Exception e) {
- }
- }
-
- /**
- * 公众号：程序员小富
- * 收到客户端消息后调用的方法
- */
- @OnMessage
- public void onMessage(String message) {
- log.info("【websocket服务端】收到客户端消息:" + message);
- }
-
- /**
- * 公众号：程序员小富
- * 发送错误时的处理
- */
- @OnError
- public void onError(Session session, Throwable error) {
- error.printStackTrace();
- }
-
- /**
- * 公众号：程序员小富
- * 此为广播消息
- */
- public void sendAllMessage(String message) {
- log.info("【websocket服务端】广播消息:" + message);
- for (WebSocketServer webSocket : webSockets) {
- try {
- if (webSocket.session.isOpen()) {
- webSocket.session.getAsyncRemote().sendText(message);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- * 公众号：程序员小富
- * 此为单点消息
- */
- public void sendOneMessage(String userId, String message) {
- Session session = sessionPool.get(userId);
- if (session != null && session.isOpen()) {
- try {
- log.info("【websocket服务端】 单点消息:" + message);
- session.getAsyncRemote().sendText(message);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- * 公众号：程序员小富
- * 此为单点消息(多人)
- */
- public void sendMoreMessage(String[] userIds, String message) {
- for (String userId : userIds) {
- Session session = sessionPool.get(userId);
- if (session != null && session.isOpen()) {
- try {
- log.info("【websocket服务端】 单点消息:" + message);
- session.getAsyncRemote().sendText(message);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- }
-}
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/sse/SSEController.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/sse/SSEController.java"
deleted file mode 100644
index d56135af..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/sse/SSEController.java"
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.springboot101.controller.sse;
-
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@CrossOrigin("*")
-@Controller
-@RequestMapping("/sse")
-public class SSEController {
-
- /**
- * sse 页面
- *
- */
- @RequestMapping("/index")
- public String sse() {
- return "sse";
- }
-
- /**
- * sse 订阅消息
- */
- @GetMapping(path = "sub/{id}", produces = {MediaType.TEXT_EVENT_STREAM_VALUE})
- @ResponseBody
- public SseEmitter sub(@PathVariable String id) throws IOException {
-
- return SseEmitterUtils.connect(id);
- }
-
- /**
- * sse 发布消息
- */
- @GetMapping(path = "push")
- @ResponseBody
- public void push(String id, String content) throws IOException {
- SseEmitterUtils.sendMessage(id, content);
- }
-
- @ResponseBody
- @GetMapping(path = "breakConnect")
- public void breakConnect(String id, HttpServletRequest request, HttpServletResponse response) {
- request.startAsync();
- SseEmitterUtils.removeUser(id);
- }
-}
-
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/sse/SseEmitterUtils.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/sse/SseEmitterUtils.java"
deleted file mode 100644
index f72f0bce..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/controller/sse/SseEmitterUtils.java"
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.springboot101.controller.sse;
-
-import cn.hutool.core.map.MapUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-
-/**
- * @Auther: 公众号：程序员小富
- * @Date: 2022/7/12 14:16
- * @Description:
- */
-@Slf4j
-@Component
-public class SseEmitterUtils {
-
- /**
- * 当前连接数
- */
- private static AtomicInteger count = new AtomicInteger(0);
-
- /**
- * 使用map对象，便于根据userId来获取对应的SseEmitter，或者放redis里面
- */
- private static Map sseEmitterMap = new ConcurrentHashMap<>();
-
- /**
- * 创建用户连接并返回 SseEmitter
- *
- * @param userId 用户ID
- * @return SseEmitter
- */
- public static SseEmitter connect(String userId) {
-
- if (sseEmitterMap.containsKey(userId)) {
- return sseEmitterMap.get(userId);
- }
- try {
- /**
- * 设置超时时间，0表示不过期。默认30秒
- */
- SseEmitter sseEmitter = new SseEmitter(0L);
- /**
- * 注册回调
- */
- sseEmitter.onCompletion(completionCallBack(userId));
- sseEmitter.onError(errorCallBack(userId));
- sseEmitter.onTimeout(timeoutCallBack(userId));
- sseEmitterMap.put(userId, sseEmitter);
- /**
- * 数量+1
- */
- count.getAndIncrement();
-
- return sseEmitter;
- } catch (Exception e) {
- log.info("创建新的sse连接异常，当前用户：{}", userId);
- }
- return null;
- }
-
- /**
- * 给指定用户发送消息
- *
- * @date: 2022/7/12 14:51
- * @auther: 公众号：程序员小富
- */
- public static void sendMessage(String userId, String message) {
-
- if (sseEmitterMap.containsKey(userId)) {
- try {
- sseEmitterMap.get(userId).send(message);
- } catch (IOException e) {
- log.error("用户[{}]推送异常:{}", userId, e.getMessage());
- removeUser(userId);
- }
- }
- }
-
- /**
- * 向同组人发布消息 （要求userId+groupId）
- *
- * @date: 2022/7/12 14:51
- * @auther: 公众号：程序员小富
- */
- public static void groupSendMessage(String groupId, String message) {
-
- if (MapUtil.isNotEmpty(sseEmitterMap)) {
- sseEmitterMap.forEach((k, v) -> {
- try {
- if (k.startsWith(groupId)) {
- v.send(message, MediaType.APPLICATION_JSON);
- }
- } catch (IOException e) {
- log.error("用户[{}]推送异常:{}", k, e.getMessage());
- removeUser(k);
- }
- });
- }
- }
-
- /**
- * 广播群发消息
- *
- * @date: 2022/7/12 14:51
- * @auther: 公众号：程序员小富
- */
- public static void batchSendMessage(String message) {
- sseEmitterMap.forEach((k, v) -> {
- try {
- v.send(message, MediaType.APPLICATION_JSON);
- } catch (IOException e) {
- log.error("用户[{}]推送异常:{}", k, e.getMessage());
- removeUser(k);
- }
- });
- }
-
- /**
- * 群发消息
- *
- * @date: 2022/7/12 14:51
- * @auther: 公众号：程序员小富
- */
- public static void batchSendMessage(String message, Set ids) {
- ids.forEach(userId -> sendMessage(userId, message));
- }
-
- /**
- * 移除用户连接
- */
- public static void removeUser(String userId) {
- sseEmitterMap.remove(userId);
- // 数量-1
- count.getAndDecrement();
- log.info("移除用户：{}", userId);
- }
-
- /**
- * 获取当前连接信息
- */
- public static List getIds() {
- return new ArrayList<>(sseEmitterMap.keySet());
- }
-
- /**
- * 获取当前连接数量
- */
- public static int getUserCount() {
- return count.intValue();
- }
-
- private static Runnable completionCallBack(String userId) {
- return () -> {
- log.info("结束连接：{}", userId);
- removeUser(userId);
- };
- }
-
- private static Runnable timeoutCallBack(String userId) {
- return () -> {
- log.info("连接超时：{}", userId);
- removeUser(userId);
- };
- }
-
- private static Consumer errorCallBack(String userId) {
- return throwable -> {
- log.info("连接异常：{}", userId);
- removeUser(userId);
- };
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/producer/IotMqttGateway.java" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/producer/IotMqttGateway.java"
deleted file mode 100644
index cb44e828..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/java/com/springboot101/producer/IotMqttGateway.java"
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.springboot101.producer;
-
-import org.springframework.integration.annotation.MessagingGateway;
-import org.springframework.integration.mqtt.support.MqttHeaders;
-import org.springframework.messaging.handler.annotation.Header;
-
-/**
- * @author 公众号：程序员小富
- * @description rabbitmq mqtt协议网关接口
- * @date 2020/6/8 18:26
- */
-@MessagingGateway(defaultRequestChannel = "iotMqttInputChannel")
-public interface IotMqttGateway {
-
- void sendMessage2Mqtt(String data);
-
- void sendMessage2Mqtt(String data, @Header(MqttHeaders.TOPIC) String topic);
-
- void sendMessage2Mqtt(@Header(MqttHeaders.TOPIC) String topic, @Header(MqttHeaders.QOS) int qos, String payload);
-}
-
-
-
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/application.yml" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/application.yml"
deleted file mode 100644
index 1003b77f..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/application.yml"
+++ /dev/null
@@ -1,8 +0,0 @@
-iot:
- mqtt:
- clientId: client-1
- defaultTopic: push_message_topic
- serverClientId: server-1
- servers: tcp://47.93.6.5:1883
-server:
- port: 7777
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/js/gg_bd_ad_720x90-2.js" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/js/gg_bd_ad_720x90-2.js"
deleted file mode 100644
index 894c033e..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/js/gg_bd_ad_720x90-2.js"
+++ /dev/null
@@ -1,18 +0,0 @@
-document.write ('');
-
-document.writeln("")
-document.writeln('');
-document.writeln('');
-document.writeln('
");
-
-document.write ('
');
-document.write ('
');
-
-document.writeln('');
\ No newline at end of file
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/js/gg_bd_ad_720x90.js" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/js/gg_bd_ad_720x90.js"
deleted file mode 100644
index e627d018..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/js/gg_bd_ad_720x90.js"
+++ /dev/null
@@ -1,103 +0,0 @@
-/*document.writeln('');
-document.writeln('');
-document.writeln('');
-document.getElementById("bdshell_js").src = "http://bdimg.share.baidu.com/static/js/shell_v2.js?cdnversion=" + new Date().getHours();*/
-
-
-//document.writeln("");
-//document.writeln("
");
-
-//document.writeln("")
-//document.writeln('');
-//document.writeln('');
-//document.writeln('
");
-
-//document.writeln("")
-//document.writeln('');
-//document.writeln('');
-//document.writeln('
");
-
-document.write ('');
-
-document.writeln("")
-document.writeln('');
-document.writeln('');
-document.writeln('
");
-
-//document.writeln('');
-//document.writeln("");
-
-//document.writeln("")
-//document.writeln('');
-//document.writeln('');
-//document.writeln('
");
-
-
-
-
-
-
-//document.writeln('');
-//document.writeln('
');
-
-
-//document.writeln("==如非特殊说明，素材均转载自网络，如侵犯了你的知识产权，请邮件联系：tx_itivy@163.com，我们会尽快处理！==
');
-document.write ('
');
-
-document.writeln('');
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/push.css" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/push.css"
deleted file mode 100644
index cfdacafc..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/push.css"
+++ /dev/null
@@ -1,27 +0,0 @@
-.button {
- background-color: #af84ab;
- border: none;
- color: white;
- padding: 8px 20px;
- text-align: center;
- text-decoration: none;
- display: inline-block;
- font-size: 16px;
- margin: 4px 2px;
- cursor: pointer;
-}
-
-.red-point {
- position: relative;
-}
-
-.red-point::before {
- content: " ";
- border: 3px solid red; /*设置红色*/
- border-radius: 3px; /*设置圆角*/
- position: absolute;
- z-index: 1000;
- right: 0%;
- margin-right: -5px;
- margin-top: -5px;
-}
\ No newline at end of file
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/style.css" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/style.css"
deleted file mode 100644
index e608df9a..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/style.css"
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-body{
- background: url('https://unsplash.imgix.net/44/9s1lvXLlSbCX5l3ZaYWP_hdr-1.jpg?q=75&fm=jpg&s=fd39ab9358b1aec7746ee67168ccf268') no-repeat center center fixed;
- -webkit-background-size: cover;
- -moz-background-size: cover;
- -o-background-size: cover;
- background-size: cover;
-
-}
-
-
-
-ul{
- margin: 2em auto;
- width: 300px;
- background: #34495e;
- list-style: none;
- padding: 0;
- font-family: 'Open Sans', sans-serif;
-}
-
-ul>li{
- color: #fff;
- background: #34495e;
- padding: 1em;
- border-bottom: 0.5em solid #2c3e50;
- margin-top: 0.25em;
- border-left: 0.5em groove #e74c3c;
- cursor: pointer;
- transition: 0.4s all;
-}
-
-i{
- padding-right: 0.5em;
-}
-.active{
- border-left: 0.5em groove #1abc9c;
-}
-
-li:hover{
- background: #2c3e50;
- border-left: 0.5em groove #3498db;
-}
-
-
-.unread{
- float: right;
- background: #e74c3c;
- width: 2em;
- border-radius: 50%;
- font-size: 0.75em;
- line-height: 2;
- text-align: center;
- animation: notificationpulse 0.5s infinite;
- -webkit-animation: notificationpulse 0.5s infinite;
- -moz-animation: notificationpulse 0.5s infinite;
-}
-/*the animations */
-@keyframes notificationpulse {
- 0% {
- box-shadow: 0 0 0 0.00em #c0392b;
- }
- 25% {
- box-shadow: 0 0 0 0.25em #c0392b;
- }
- 50% {
- box-shadow: 0 0 0 0.50em #c0392b;
- }
- 75% {
- box-shadow: 0 0 0 0.25em #c0392b;
- }
- 100% {
- box-shadow: 0 0 0 0.15em #c0392b;
- }
-}
-@-webkit-keyframes notificationpulse {
- 0% {
- box-shadow: 0 0 0 0.00em #c0392b;
- }
- 25% {
- box-shadow: 0 0 0 0.25em #c0392b;
- }
- 50% {
- box-shadow: 0 0 0 0.50em #c0392b;
- }
- 75% {
- box-shadow: 0 0 0 0.25em #c0392b;
- }
- 100% {
- box-shadow: 0 0 0 0.15em #c0392b;
- }
-}
-
-@-moz-keyframes notificationpulse {
- 0% {
- box-shadow: 0 0 0 0.00em #c0392b;
- }
- 25% {
- box-shadow: 0 0 0 0.25em #c0392b;
- }
- 50% {
- box-shadow: 0 0 0 0.50em #c0392b;
- }
- 75% {
- box-shadow: 0 0 0 0.25em #c0392b;
- }
- 100% {
- box-shadow: 0 0 0 0.15em #c0392b;
- }
-}
diff --git "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/vue.min.js" "b/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/vue.min.js"
deleted file mode 100644
index 4d6dad39..00000000
--- "a/springboot101/\345\256\236\346\227\266\346\216\250\351\200\201/springboot-realtime-data/src/main/resources/static/vue.min.js"
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * Vue.js v2.1.6
- * (c) 2014-2016 Evan You
- * Released under the MIT License.
- */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.Vue=t()}(this,function(){"use strict";function e(e){return null==e?"":"object"==typeof e?JSON.stringify(e,null,2):String(e)}function t(e){var t=parseFloat(e,10);return t||0===t?t:e}function n(e,t){for(var n=Object.create(null),r=e.split(","),i=0;i-1)return e.splice(n,1)}}function i(e,t){return Yr.call(e,t)}function a(e){return"string"==typeof e||"number"==typeof e}function o(e){var t=Object.create(null);return function(n){var r=t[n];return r||(t[n]=e(n))}}function s(e,t){function n(n){var r=arguments.length;return r?r>1?e.apply(t,arguments):e.call(t,n):e.call(t)}return n._length=e.length,n}function c(e,t){t=t||0;for(var n=e.length-t,r=new Array(n);n--;)r[n]=e[n+t];return r}function l(e,t){for(var n in t)e[n]=t[n];return e}function u(e){return null!==e&&"object"==typeof e}function f(e){return ri.call(e)===ii}function d(e){for(var t={},n=0;n=0&&Li[n].id>e.id;)n--;Li.splice(Math.max(n,Ri)+1,0,e)}else Li.push(e);Mi||(Mi=!0,_i(B))}}function V(e){Ui.clear(),J(e,Ui)}function J(e,t){var n,r,i=Array.isArray(e);if((i||u(e))&&Object.isExtensible(e)){if(e.__ob__){var a=e.__ob__.dep.id;if(t.has(a))return;t.add(a)}if(i)for(n=e.length;n--;)J(e[n],t);else for(r=Object.keys(e),n=r.length;n--;)J(e[r[n]],t)}}function K(e){e._watchers=[];var t=e.$options;t.props&&q(e,t.props),t.methods&&Y(e,t.methods),t.data?W(e):k(e._data={},!0),t.computed&&Z(e,t.computed),t.watch&&Q(e,t.watch)}function q(e,t){var n=e.$options.propsData||{},r=e.$options._propKeys=Object.keys(t),i=!e.$parent;Si.shouldConvert=i;for(var a=function(i){var a=r[i];A(e,a,R(a,t,n,e))},o=0;o1?c(n):n;for(var r=c(arguments,1),i=0,a=n.length;i-1:e.test(t)}function qe(e){var t={};t.get=function(){return si},Object.defineProperty(e,"config",t),e.util=Ni,e.set=O,e.delete=S,e.nextTick=_i,e.options=Object.create(null),si._assetTypes.forEach(function(t){e.options[t+"s"]=Object.create(null)}),e.options._base=e,l(e.options.components,Yi),Be(e),ze(e),Ve(e),Je(e)}function We(e){for(var t=e.data,n=e,r=e;r.child;)r=r.child._vnode,r.data&&(t=Ze(r.data,t));for(;n=n.parent;)n.data&&(t=Ze(t,n.data));return Ge(t)}function Ze(e,t){return{staticClass:Ye(e.staticClass,t.staticClass),class:e.class?[e.class,t.class]:t.class}}function Ge(e){var t=e.class,n=e.staticClass;return n||t?Ye(n,Qe(t)):""}function Ye(e,t){return e?t?e+" "+t:e:t||""}function Qe(e){var t="";if(!e)return t;if("string"==typeof e)return e;if(Array.isArray(e)){for(var n,r=0,i=e.length;r-1?pa[e]=t.constructor===window.HTMLUnknownElement||t.constructor===window.HTMLElement:pa[e]=/HTMLUnknownElement/.test(t.toString())}function tt(e){if("string"==typeof e){if(e=document.querySelector(e),!e)return document.createElement("div")}return e}function nt(e,t){var n=document.createElement(e);return"select"!==e?n:(t.data&&t.data.attrs&&"multiple"in t.data.attrs&&n.setAttribute("multiple","multiple"),n)}function rt(e,t){return document.createElementNS(ca[e],t)}function it(e){return document.createTextNode(e)}function at(e){return document.createComment(e)}function ot(e,t,n){e.insertBefore(t,n)}function st(e,t){e.removeChild(t)}function ct(e,t){e.appendChild(t)}function lt(e){return e.parentNode}function ut(e){return e.nextSibling}function ft(e){return e.tagName}function dt(e,t){e.textContent=t}function pt(e,t,n){e.setAttribute(t,n)}function vt(e,t){var n=e.data.ref;if(n){var i=e.context,a=e.child||e.elm,o=i.$refs;t?Array.isArray(o[n])?r(o[n],a):o[n]===a&&(o[n]=void 0):e.data.refInFor?Array.isArray(o[n])&&o[n].indexOf(a)<0?o[n].push(a):o[n]=[a]:o[n]=a}}function ht(e){return null==e}function mt(e){return null!=e}function gt(e,t){return e.key===t.key&&e.tag===t.tag&&e.isComment===t.isComment&&!e.data==!t.data}function yt(e,t,n){var r,i,a={};for(r=t;r<=n;++r)i=e[r].key,mt(i)&&(a[i]=r);return a}function _t(e){function t(e){return new zi(O.tagName(e).toLowerCase(),{},[],void 0,e)}function r(e,t){function n(){0===--n.listeners&&i(e)}return n.listeners=t,n}function i(e){var t=O.parentNode(e);t&&O.removeChild(t,e)}function o(e,t,n,r,i){if(e.isRootInsert=!i,!s(e,t,n,r)){var a=e.data,o=e.children,c=e.tag;mt(c)?(e.elm=e.ns?O.createElementNS(e.ns,c):O.createElement(c,e),v(e),u(e,o,t),mt(a)&&d(e,t),l(n,e.elm,r)):e.isComment?(e.elm=O.createComment(e.text),l(n,e.elm,r)):(e.elm=O.createTextNode(e.text),l(n,e.elm,r))}}function s(e,t,n,r){var i=e.data;if(mt(i)){var a=mt(e.child)&&i.keepAlive;if(mt(i=i.hook)&&mt(i=i.init)&&i(e,!1,n,r),mt(e.child))return p(e,t),a&&c(e,t,n,r),!0}}function c(e,t,n,r){for(var i,a=e;a.child;)if(a=a.child._vnode,mt(i=a.data)&&mt(i=i.transition)){for(i=0;id?(l=ht(n[m+1])?null:n[m+1].elm,h(e,l,n,f,m,r)):f>m&&g(e,t,u,d)}function b(e,t,n,r){if(e!==t){if(t.isStatic&&e.isStatic&&t.key===e.key&&(t.isCloned||t.isOnce))return t.elm=e.elm,void(t.child=e.child);var i,a=t.data,o=mt(a);o&&mt(i=a.hook)&&mt(i=i.prepatch)&&i(e,t);var s=t.elm=e.elm,c=e.children,l=t.children;if(o&&f(t)){for(i=0;i-1?t.split(/\s+/).forEach(function(t){return e.classList.add(t)}):e.classList.add(t);else{var n=" "+e.getAttribute("class")+" ";n.indexOf(" "+t+" ")<0&&e.setAttribute("class",(n+t).trim())}}function It(e,t){if(t&&t.trim())if(e.classList)t.indexOf(" ")>-1?t.split(/\s+/).forEach(function(t){return e.classList.remove(t)}):e.classList.remove(t);else{for(var n=" "+e.getAttribute("class")+" ",r=" "+t+" ";n.indexOf(r)>=0;)n=n.replace(r," ");e.setAttribute("class",n.trim())}}function Ft(e){Fa(function(){Fa(e)})}function Ht(e,t){(e._transitionClasses||(e._transitionClasses=[])).push(t),Rt(e,t)}function Ut(e,t){e._transitionClasses&&r(e._transitionClasses,t),It(e,t)}function Bt(e,t,n){var r=zt(e,t),i=r.type,a=r.timeout,o=r.propCount;if(!i)return n();var s=i===La?Pa:Ia,c=0,l=function(){e.removeEventListener(s,u),n()},u=function(t){t.target===e&&++c>=o&&l()};setTimeout(function(){c0&&(n=La,u=o,f=a.length):t===Da?l>0&&(n=Da,u=l,f=c.length):(u=Math.max(o,l),n=u>0?o>l?La:Da:null,f=n?n===La?a.length:c.length:0);var d=n===La&&Ha.test(r[Ma+"Property"]);return{type:n,timeout:u,propCount:f,hasTransform:d}}function Vt(e,t){for(;e.length1,T=n._enterCb=Zt(function(){O&&Ut(n,w),T.cancelled?(O&&Ut(n,$),
-A&&A(n)):k&&k(n),n._enterCb=null});e.data.show||ae(e.data.hook||(e.data.hook={}),"insert",function(){var t=n.parentNode,r=t&&t._pending&&t._pending[e.key];r&&r.context===e.context&&r.tag===e.tag&&r.elm._leaveCb&&r.elm._leaveCb(),C&&C(n,T)},"transition-insert"),x&&x(n),O&&(Ht(n,$),Ht(n,w),Ft(function(){Ut(n,$),T.cancelled||S||Bt(n,a,T)})),e.data.show&&(t&&t(),C&&C(n,T)),O||S||T()}}}function qt(e,t){function n(){m.cancelled||(e.data.show||((r.parentNode._pending||(r.parentNode._pending={}))[e.key]=e),l&&l(r),v&&(Ht(r,s),Ht(r,c),Ft(function(){Ut(r,s),m.cancelled||h||Bt(r,o,m)})),u&&u(r,m),v||h||m())}var r=e.elm;r._enterCb&&(r._enterCb.cancelled=!0,r._enterCb());var i=Wt(e.data.transition);if(!i)return t();if(!r._leaveCb&&1===r.nodeType){var a=i.css,o=i.type,s=i.leaveClass,c=i.leaveActiveClass,l=i.beforeLeave,u=i.leave,f=i.afterLeave,d=i.leaveCancelled,p=i.delayLeave,v=a!==!1&&!pi,h=u&&(u._length||u.length)>1,m=r._leaveCb=Zt(function(){r.parentNode&&r.parentNode._pending&&(r.parentNode._pending[e.key]=null),v&&Ut(r,c),m.cancelled?(v&&Ut(r,s),d&&d(r)):(t(),f&&f(r)),r._leaveCb=null});p?p(n):n()}}function Wt(e){if(e){if("object"==typeof e){var t={};return e.css!==!1&&l(t,Ua(e.name||"v")),l(t,e),t}return"string"==typeof e?Ua(e):void 0}}function Zt(e){var t=!1;return function(){t||(t=!0,e())}}function Gt(e,t){t.data.show||Kt(t)}function Yt(e,t,n){var r=t.value,i=e.multiple;if(!i||Array.isArray(r)){for(var a,o,s=0,c=e.options.length;s-1,o.selected!==a&&(o.selected=a);else if(h(Xt(o),r))return void(e.selectedIndex!==s&&(e.selectedIndex=s));i||(e.selectedIndex=-1)}}function Qt(e,t){for(var n=0,r=t.length;n',n.innerHTML.indexOf(t)>0}function pn(e){return eo=eo||document.createElement("div"),eo.innerHTML=e,eo.textContent}function vn(e,t){return t&&(e=e.replace(Zo,"\n")),e.replace(qo,"<").replace(Wo,">").replace(Go,"&").replace(Yo,'"')}function hn(e,t){function n(t){f+=t,e=e.substring(t)}function r(){var t=e.match(fo);if(t){var r={tagName:t[1],attrs:[],start:f};n(t[0].length);for(var i,a;!(i=e.match(po))&&(a=e.match(co));)n(a[0].length),r.attrs.push(a);if(i)return r.unarySlash=i[1],n(i[0].length),r.end=f,r}}function i(e){var n=e.tagName,r=e.unarySlash;l&&("p"===s&&io(n)&&a("",s),ro(n)&&s===n&&a("",n));for(var i=u(n)||"html"===n&&"head"===s||!!r,o=e.attrs.length,f=new Array(o),d=0;d=0&&c[a].tag.toLowerCase()!==o;a--);}else a=0;if(a>=0){for(var l=c.length-1;l>=a;l--)t.end&&t.end(c[l].tag,r,i);c.length=a,s=a&&c[a-1].tag}else"br"===n.toLowerCase()?t.start&&t.start(n,[],!0,r,i):"p"===n.toLowerCase()&&(t.start&&t.start(n,[],!1,r,i),t.end&&t.end(n,r,i))}for(var o,s,c=[],l=t.expectHTML,u=t.isUnaryTag||ai,f=0;e;){if(o=e,s&&Jo(s,t.sfc,c)){var d=s.toLowerCase(),p=Ko[d]||(Ko[d]=new RegExp("([\\s\\S]*?)(]*>)","i")),v=0,h=e.replace(p,function(e,n,r){return v=r.length,"script"!==d&&"style"!==d&&"noscript"!==d&&(n=n.replace(//g,"$1").replace(//g,"$1")),t.chars&&t.chars(n),""});f+=e.length-h.length,e=h,a("",d,f-v,f)}else{var m=e.indexOf("<");if(0===m){if(mo.test(e)){var g=e.indexOf("-->");if(g>=0){n(g+3);continue}}if(go.test(e)){var y=e.indexOf("]>");if(y>=0){n(y+2);continue}}var _=e.match(ho);if(_){n(_[0].length);continue}var b=e.match(vo);if(b){var $=f;n(b[0].length),a(b[0],b[1],$,f);continue}var w=r();if(w){i(w);continue}}var x=void 0,C=void 0,k=void 0;if(m>0){for(C=e.slice(m);!(vo.test(C)||fo.test(C)||mo.test(C)||go.test(C)||(k=C.indexOf("<",1),k<0));)m+=k,C=e.slice(m);x=e.substring(0,m),n(m)}m<0&&(x=e,e=""),t.chars&&x&&t.chars(x)}if(e===o&&t.chars){t.chars(e);break}}a()}function mn(e){function t(){(o||(o=[])).push(e.slice(v,i).trim()),v=i+1}var n,r,i,a,o,s=!1,c=!1,l=!1,u=!1,f=0,d=0,p=0,v=0;for(i=0;i=0&&(m=e.charAt(h)," "===m);h--);m&&/[\w$]/.test(m)||(u=!0)}}else void 0===a?(v=i+1,a=e.slice(0,i).trim()):t();if(void 0===a?a=e.slice(0,i).trim():0!==v&&t(),o)for(i=0;io&&a.push(JSON.stringify(e.slice(o,i)));var s=mn(r[1].trim());a.push("_s("+s+")"),o=i+r[0].length}return o=_o}function En(e){return 34===e||39===e}function jn(e){var t=1;for(xo=wo;!Tn();)if(e=Sn(),En(e))Nn(e);else if(91===e&&t++,93===e&&t--,0===t){Co=wo;break}}function Nn(e){for(var t=e;!Tn()&&(e=Sn(),e!==t););}function Ln(e,t){ko=t.warn||_n,Ao=t.getTagNamespace||ai,Oo=t.mustUseProp||ai,So=t.isPreTag||ai,To=bn(t.modules,"preTransformNode"),Eo=bn(t.modules,"transformNode"),jo=bn(t.modules,"postTransformNode"),No=t.delimiters;var n,r,i=[],a=t.preserveWhitespace!==!1,o=!1,s=!1;return hn(e,{expectHTML:t.expectHTML,isUnaryTag:t.isUnaryTag,shouldDecodeNewlines:t.shouldDecodeNewlines,start:function(e,a,c){function l(e){}var u=r&&r.ns||Ao(e);di&&"svg"===u&&(a=Yn(a));var f={type:1,tag:e,attrsList:a,attrsMap:Wn(a),parent:r,children:[]};u&&(f.ns=u),Gn(f)&&!gi()&&(f.forbidden=!0);for(var d=0;d-1:_q("+t+","+a+")"),Cn(e,"change","var $$a="+t+",$$el=$event.target,$$c=$$el.checked?("+a+"):("+o+");if(Array.isArray($$a)){var $$v="+(r?"_n("+i+")":i)+",$$i=_i($$a,$$v);if($$c){$$i<0&&("+t+"=$$a.concat($$v))}else{$$i>-1&&("+t+"=$$a.slice(0,$$i).concat($$a.slice($$i+1)))}}else{"+t+"=$$c}",null,!0)}function Ir(e,t,n){var r=n&&n.number,i=kn(e,"value")||"null";i=r?"_n("+i+")":i,$n(e,"checked","_q("+t+","+i+")"),Cn(e,"change",Ur(t,i),null,!0)}function Fr(e,t,n){var r=e.attrsMap.type,i=n||{},a=i.lazy,o=i.number,s=i.trim,c=a||di&&"range"===r?"change":"input",l=!a&&"range"!==r,u="input"===e.tag||"textarea"===e.tag,f=u?"$event.target.value"+(s?".trim()":""):s?"(typeof $event === 'string' ? $event.trim() : $event)":"$event";f=o||"number"===r?"_n("+f+")":f;var d=Ur(t,f);u&&l&&(d="if($event.target.composing)return;"+d),$n(e,"value",u?"_s("+t+")":"("+t+")"),Cn(e,c,d,null,!0),(s||o||"number"===r)&&Cn(e,"blur","$forceUpdate()")}function Hr(e,t,n){var r=n&&n.number,i='Array.prototype.filter.call($event.target.options,function(o){return o.selected}).mapper(function(o){var val = "_value" in o ? o._value : o.value;return '+(r?"_n(val)":"val")+"})"+(null==e.attrsMap.multiple?"[0]":""),a=Ur(t,i);Cn(e,"change",a,null,!0)}function Ur(e,t){var n=On(e);return null===n.idx?e+"="+t:"var $$exp = "+n.exp+", $$idx = "+n.idx+";if (!Array.isArray($$exp)){"+e+"="+t+"}else{$$exp.splice($$idx, 1, "+t+")}"}function Br(e,t){t.value&&$n(e,"textContent","_s("+t.value+")")}function zr(e,t){t.value&&$n(e,"innerHTML","_s("+t.value+")")}function Vr(e,t){return t=t?l(l({},ws),t):ws,jr(e,t)}function Jr(e,t,n){var r=(t&&t.warn||$i,t&&t.delimiters?String(t.delimiters)+e:e);if($s[r])return $s[r];var i={},a=Vr(e,t);i.render=Kr(a.render);var o=a.staticRenderFns.length;i.staticRenderFns=new Array(o);for(var s=0;s0,vi=fi&&fi.indexOf("edge/")>0,hi=fi&&fi.indexOf("android")>0,mi=fi&&/iphone|ipad|ipod|ios/.test(fi),gi=function(){return void 0===Wr&&(Wr=!ui&&"undefined"!=typeof global&&"server"===global.process.env.VUE_ENV),Wr},yi=ui&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__,_i=function(){function e(){r=!1;var e=n.slice(0);n.length=0;for(var t=0;t1&&(t[n[0].trim()]=n[1].trim())}}),t}),Aa=/^--/,Oa=/\s*!important$/,Sa=function(e,t,n){Aa.test(t)?e.style.setProperty(t,n):Oa.test(n)?e.style.setProperty(t,n.replace(Oa,""),"important"):e.style[Ea(t)]=n},Ta=["Webkit","Moz","ms"],Ea=o(function(e){if(Xi=Xi||document.createElement("div"),e=Xr(e),"filter"!==e&&e in Xi.style)return e;for(var t=e.charAt(0).toUpperCase()+e.slice(1),n=0;n\/=]+)/,oo=/(?:=)/,so=[/"([^"]*)"+/.source,/'([^']*)'+/.source,/([^\s"'=<>`]+)/.source],co=new RegExp("^\\s*"+ao.source+"(?:\\s*("+oo.source+")\\s*(?:"+so.join("|")+"))?"),lo="[a-zA-Z_][\\w\\-\\.]*",uo="((?:"+lo+"\\:)?"+lo+")",fo=new RegExp("^<"+uo),po=/^\s*(\/?)>/,vo=new RegExp("^<\\/"+uo+"[^>]*>"),ho=/^]+>/i,mo=/^
-
- org.springframework.boot
- spring-boot-starter-security
-
-
-
diff --git "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/SwaggerApplication.java" "b/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/SwaggerApplication.java"
deleted file mode 100644
index d9740e42..00000000
--- "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/SwaggerApplication.java"
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class SwaggerApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(SwaggerApplication.class, args);
- }
-}
diff --git "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/config/SecurityConfig.java" "b/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/config/SecurityConfig.java"
deleted file mode 100644
index bf77a84a..00000000
--- "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/config/SecurityConfig.java"
+++ /dev/null
@@ -1,23 +0,0 @@
-//package com.springboot101.config;
-//
-//import org.springframework.context.annotation.Configuration;
-//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;
-//
-//@Configuration
-//@EnableWebSecurity
-//public class SecurityConfig extends WebSecurityConfigurerAdapter {
-//
-// @Override
-// protected void configure(HttpSecurity http) throws Exception {
-// http.csrf().disable()
-// .authorizeRequests()
-// .antMatchers("/swagger-ui/**", "/v3/api-docs/**").permitAll()
-// .anyRequest().authenticated()
-// .and()
-// .formLogin()
-// .loginPage("/login")
-// .permitAll();
-// }
-//}
\ No newline at end of file
diff --git "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/config/SwaggerConfig.java" "b/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/config/SwaggerConfig.java"
deleted file mode 100644
index 0dcacbcd..00000000
--- "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/config/SwaggerConfig.java"
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.springboot101.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-import org.springframework.core.env.Profiles;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.*;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.contexts.SecurityContext;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-@EnableWebMvc
-@Configuration
-@EnableSwagger2
-public class SwaggerConfig {
-
- /**
- * 配置docket 具体参数
- */
- @Bean
- public Docket docket(Environment environment) {
-
- // 设置要显示swagger的环境
- Profiles of = Profiles.of("dev", "test", "pre");
- boolean enable = environment.acceptsProfiles(of);
-
- return new Docket(DocumentationType.SWAGGER_2)
- .host("http://test.com") // 请求地址
- .groupName("用户分组")
- .select()
- .apis(RequestHandlerSelectors.basePackage("com.springboot101.controller"))
-// .paths(PathSelectors.ant("/test/**"))
- .build()
- .enable(true)
-// .tags(new Tag("tag测试-1", "tag测试-1描述"))
- .apiInfo(apiInfo()) // 文档基础配置
- .securitySchemes(
- Arrays.asList(
- new ApiKey("Bearer", "Bearer", "header"),
- new ApiKey("Authorization", "Authorization", "header"),
- new ApiKey("Basic", "Basic", "header")
- )
- )
- .securityContexts(Collections.singletonList(securityContext()));
- }
-
- private SecurityContext securityContext() {
- return SecurityContext.builder()
- .securityReferences(
- Arrays.asList(
- new SecurityReference("Authorization", new AuthorizationScope[0]),
- new SecurityReference("Bearer", new AuthorizationScope[0]),
- new SecurityReference("Basic", new AuthorizationScope[0])))
- .build();
- }
-
- @Bean
- public Docket docket1(Environment environment) {
- return new Docket(DocumentationType.SWAGGER_2)
- .groupName("商家分组")
- .tags(new Tag("tag测试-2", "tag测试-2描述"))
- .select()
- .apis(RequestHandlerSelectors.basePackage("com.springboot101.controller"))
- .paths(PathSelectors.ant("/test1/**"))
- .build();
- }
-
- /**
- * 文档基础信息
- */
- private ApiInfo apiInfo() {
- Contact contact = new Contact("小富", "http://fire100.top/contact", "email@example.com");
- return new ApiInfoBuilder()
- .title("Swagger学习")
- .description("程序员小富-带你一起学习 Swagger")
- .version("v1.0.1")
- .termsOfServiceUrl("http://fire100.top")
- .contact(contact)
- .license("许可证")
- .licenseUrl("许可链接")
- .extensions(Arrays.asList(
- new StringVendorExtension("我是", "小富"),
- new StringVendorExtension("你是", "谁")
- ))
- .build();
- }
-
-
-// @Bean
-// public static BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() {
-// return new BeanPostProcessor() {
-//
-// @Override
-// public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-// if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) {
-// customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
-// }
-// return bean;
-// }
-//
-// private void customizeSpringfoxHandlerMappings(List mappings) {
-// List copy = mappings.stream()
-// .filter(mapping -> mapping.getPatternParser() == null)
-// .collect(Collectors.toList());
-// mappings.clear();
-// mappings.addAll(copy);
-// }
-//
-// @SuppressWarnings("unchecked")
-// private List getHandlerMappings(Object bean) {
-// try {
-// Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");
-// field.setAccessible(true);
-// return (List) field.get(bean);
-// } catch (IllegalArgumentException | IllegalAccessException e) {
-// throw new IllegalStateException(e);
-// }
-// }
-// };
-// }
-}
\ No newline at end of file
diff --git "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/controller/UserController.java" "b/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/controller/UserController.java"
deleted file mode 100644
index 1848a94f..00000000
--- "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/controller/UserController.java"
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.springboot101.controller;
-
-
-import com.springboot101.dto.UserDto;
-import com.springboot101.po.User;
-import io.swagger.annotations.*;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-@Api(value = "用户管理接口描述",
- description = "用户管理接口描述",
- hidden = false,
- produces = "application/json",
- consumes = "application/json",
- protocols = "https",
- tags = {"用户管理"},
- authorizations = {
- @Authorization(value = "apiKey", scopes = {
- @AuthorizationScope(scope = "read:user", description = "读权限"),
- @AuthorizationScope(scope = "write:user", description = "写权限")
- }),
- @Authorization(value = "basicAuth")
- })
-@RestController
-public class UserController {
-
- @ApiResponses(value = {
- @ApiResponse(code = 200, message = "@ApiResponse注解测试通过", response = String.class),
- @ApiResponse(code = 401, message = "可能参数填的有问题", response = String.class),
- @ApiResponse(code = 404, message = "可能请求路径写的有问题", response = String.class)
- })
- @GetMapping("/user4")
- public String user4(@ApiParam(name = "主键ID", value = "@ApiParam注解测试", required = true) String id) {
- return id;
- }
-
- @ApiImplicitParams({
- @ApiImplicitParam(name = "用户名", value = "用户名称信息", required = true, dataType = "String", paramType = "query")
- })
- @GetMapping("/user")
- public String user(String name) {
- return name;
- }
-
- @ApiOperation(
- value = "获取用户信息",
- notes = "通过用户ID获取用户的详细信息",
- hidden = false,
- response = UserDto.class,
- tags = {"用户管理"},
- produces = "application/json",
- consumes = "application/json",
- protocols = "https",
- authorizations = {
- @Authorization(value = "apiKey", scopes = {@AuthorizationScope(scope = "read:user", description = "Read user information")}),
- @Authorization(value = "Basic")
- },
- responseHeaders = {@ResponseHeader(name = "X-Custom-Header", description = "Custom header", response = String.class)},
- code = 200
- )
- @GetMapping("/user1")
- public UserDto user1(@RequestBody User user) {
- return new UserDto();
- }
-
- @ApiIgnore
- @GetMapping("/user2/{id}")
- public User test2(@PathVariable Integer id, @RequestBody User user) {
- return user;
- }
-}
diff --git "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/dto/UserDto.java" "b/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/dto/UserDto.java"
deleted file mode 100644
index 529dde45..00000000
--- "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/dto/UserDto.java"
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.springboot101.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class UserDto {
-
- private String name;
-
- private Integer age;
-
- private String email;
-
- private Date createTime;
-
- private Date updateTime;
-}
-
diff --git "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/po/User.java" "b/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/po/User.java"
deleted file mode 100644
index bbb89015..00000000
--- "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/java/com/springboot101/po/User.java"
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.springboot101.po;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel(value = "用户实体类", description = "用于存放用户登录信息")
-@Data
-public class User {
-
- @ApiModelProperty(value = "用户名字段", required = true, example = "#公众号：程序员小富", name = "1111")
- private String name;
-
- @ApiModelProperty(value = "年龄", required = true, example = "19")
- private Integer age;
-
- @ApiModelProperty(value = "邮箱", required = true, example = "#公众号：程序员小富")
- private String email;
-}
-
diff --git "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/resources/application.yml" "b/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/resources/application.yml"
deleted file mode 100644
index a651eecf..00000000
--- "a/springboot101/\346\216\245\345\217\243\346\226\207\346\241\243/springboot-swagger/src/main/resources/application.yml"
+++ /dev/null
@@ -1,9 +0,0 @@
-server:
- port: 9002
-
-# 登录账号密码
-spring:
- security:
- user:
- name: admin
- password: 123456
\ No newline at end of file
diff --git "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/README.md" "b/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/README.md"
deleted file mode 100644
index cb80a2fb..00000000
--- "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/README.md"
+++ /dev/null
@@ -1 +0,0 @@
-springboot注解实现动态数据源切换
\ No newline at end of file
diff --git "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/pom.xml" "b/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/pom.xml"
deleted file mode 100644
index 17af33ed..00000000
--- "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/pom.xml"
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
- 4.0.0
-
- org.springframework.boot
- spring-boot-starter-parent
- 2.7.6
-
- com.dynamic
- springboot-dynamic-datasource
- 0.0.1-SNAPSHOT
-
- 8
- 8
- 3.5.3.1
- 8.0.32
- 1.2.6
-
-
-
-
- org.springframework.boot
- spring-boot-starter
-
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
-
- com.mysql
- mysql-connector-j
- ${mysql.connector.version}
-
-
-
- org.projectlombok
- lombok
- true
-
-
-
- com.baomidou
- mybatis-plus-boot-starter
- ${mybatis.plus.version}
-
-
-
- com.alibaba
- druid-spring-boot-starter
- ${druid.version}
-
-
- org.apache.commons
- commons-lang3
- 3.7
-
-
- org.aspectj
- aspectjweaver
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/sql/test.sql" "b/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/sql/test.sql"
deleted file mode 100644
index 78cfd049..00000000
--- "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/sql/test.sql"
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE `t_dynamic_datasource_data` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT,
- `source_name` varchar(25) DEFAULT NULL,
- PRIMARY KEY (`id`)
-) ;
-
-insert into t_dynamic_datasource_data (source_name) value ('dynamic_datasource_master');
-
-insert into t_dynamic_datasource_data (source_name) value ('dynamic_datasource_slave');
diff --git "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/DynamicDatasourceApplication.java" "b/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/DynamicDatasourceApplication.java"
deleted file mode 100644
index 75592071..00000000
--- "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/DynamicDatasourceApplication.java"
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dynamic;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-
-@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
-public class DynamicDatasourceApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(DynamicDatasourceApplication.class, args);
- }
-}
diff --git "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/aspect/DS.java" "b/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/aspect/DS.java"
deleted file mode 100644
index 9e1367e7..00000000
--- "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/aspect/DS.java"
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dynamic.aspect;
-
-import java.lang.annotation.*;
-
-/**
- * 定于数据源切换注解
- *
- * @author 公众号：程序员小富
- * @date 2023/11/27 11:02
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-public @interface DS {
- // 默认数据源master
- String value() default "master";
-}
\ No newline at end of file
diff --git "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/aspect/DSAspect.java" "b/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/aspect/DSAspect.java"
deleted file mode 100644
index abbb28eb..00000000
--- "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/aspect/DSAspect.java"
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dynamic.aspect;
-
-import com.dynamic.config.DataSourceContextHolder;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Method;
-import java.util.Objects;
-
-/**
- * 实现@DS注解的AOP切面
- *
- * @author 公众号：程序员小富
- * @date 2023/11/27 11:02
- */
-@Aspect
-@Component
-@Slf4j
-public class DSAspect {
-
- @Pointcut("@annotation(com.dynamic.aspect.DS)")
- public void dynamicDataSource() {
- }
-
- @Around("dynamicDataSource()")
- public Object datasourceAround(ProceedingJoinPoint point) throws Throwable {
- MethodSignature signature = (MethodSignature) point.getSignature();
- Method method = signature.getMethod();
- DS ds = method.getAnnotation(DS.class);
- if (Objects.nonNull(ds)) {
- DataSourceContextHolder.setDataSource(ds.value());
- }
- try {
- return point.proceed();
- } finally {
- DataSourceContextHolder.removeDataSource();
- }
- }
-}
diff --git "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/config/DataSourceContextHolder.java" "b/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/config/DataSourceContextHolder.java"
deleted file mode 100644
index e00d3981..00000000
--- "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/config/DataSourceContextHolder.java"
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.dynamic.config;
-
-/**
- * ThreadLocal存放数据源变量
- *
- * @author 公众号：程序员小富
- * @date 2023/11/27 11:02
- */
-public class DataSourceContextHolder {
-
- private static final ThreadLocal DATASOURCE_HOLDER = new ThreadLocal<>();
-
- /**
- * 获取当前线程的数据源
- *
- * @return 数据源名称
- */
- public static String getDataSource() {
- return DATASOURCE_HOLDER.get();
- }
-
- /**
- * 设置数据源
- *
- * @param dataSourceName 数据源名称
- */
- public static void setDataSource(String dataSourceName) {
- DATASOURCE_HOLDER.set(dataSourceName);
- }
-
- /**
- * 删除当前数据源
- */
- public static void removeDataSource() {
- DATASOURCE_HOLDER.remove();
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/config/DateSourceConfig.java" "b/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/config/DateSourceConfig.java"
deleted file mode 100644
index 11c9c1fd..00000000
--- "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/config/DateSourceConfig.java"
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dynamic.config;
-
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-import javax.sql.DataSource;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 注册多个数据源
- *
- * @author 公众号：程序员小富
- * @date 2023/11/27 11:02
- */
-@Configuration
-public class DateSourceConfig {
-
- @Bean
- @ConfigurationProperties("spring.datasource.druid.master")
- public DataSource dynamicDatasourceMaster() {
- return DruidDataSourceBuilder.create().build();
- }
-
- @Bean
- @ConfigurationProperties("spring.datasource.druid.slave")
- public DataSource dynamicDatasourceSlave() {
- return DruidDataSourceBuilder.create().build();
- }
-
- @Bean(name = "dynamicDataSource")
- @Primary
- public DynamicDataSource createDynamicDataSource() {
- Map dataSourceMap = new HashMap<>();
- // 设置默认的数据源为Master
- DataSource defaultDataSource = dynamicDatasourceMaster();
- dataSourceMap.put("master", defaultDataSource);
- dataSourceMap.put("slave", dynamicDatasourceSlave());
- return new DynamicDataSource(defaultDataSource, dataSourceMap);
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/config/DynamicDataSource.java" "b/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/config/DynamicDataSource.java"
deleted file mode 100644
index 7f22cf36..00000000
--- "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/config/DynamicDataSource.java"
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.dynamic.config;
-
-import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
-
-import javax.sql.DataSource;
-import java.util.Map;
-
-/**
- * 继承 AbstractRoutingDataSource
- * 重置当前的数据库路由，实现切换成想要执行的目标数据库
- *
- * @author 公众号：程序员小富
- * @date 2023/11/27 11:02
- */
-public class DynamicDataSource extends AbstractRoutingDataSource {
-
- public DynamicDataSource(DataSource defaultDataSource, Map targetDataSources) {
- super.setDefaultTargetDataSource(defaultDataSource);
- super.setTargetDataSources(targetDataSources);
- }
-
- /**
- * 这一步是关键
- * @return
- */
- @Override
- protected Object determineCurrentLookupKey() {
- return DataSourceContextHolder.getDataSource();
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/controller/DynamicSwitchController.java" "b/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/controller/DynamicSwitchController.java"
deleted file mode 100644
index db3c1315..00000000
--- "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/controller/DynamicSwitchController.java"
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.dynamic.controller;
-
-import com.dynamic.aspect.DS;
-import com.dynamic.config.DataSourceContextHolder;
-import com.dynamic.dao.DynamicDatasourceDataMapper;
-import com.dynamic.entity.DynamicDatasourceData;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * 动态数据源切换
- *
- * @author 公众号：程序员小富
- * @date 2023/11/27 11:02
- */
-@RestController
-public class DynamicSwitchController {
-
- @Resource
- private DynamicDatasourceDataMapper dynamicDatasourceDataMapper;
-
- @GetMapping("/switchDataSource/{datasourceName}")
- public String switchDataSource(@PathVariable("datasourceName") String datasourceName) {
- DataSourceContextHolder.setDataSource(datasourceName);
- DynamicDatasourceData dynamicDatasourceData = dynamicDatasourceDataMapper.selectOne(null);
- DataSourceContextHolder.removeDataSource();
- return dynamicDatasourceData.getSourceName();
- }
-
- @DS(value = "master")
- @GetMapping("/dbMaster")
- public String dbMaster() {
- DynamicDatasourceData dynamicDatasourceData = dynamicDatasourceDataMapper.selectOne(null);
- return dynamicDatasourceData.getSourceName();
- }
-
- @DS(value = "slave")
- @GetMapping("/dbSlave")
- public String dbSlave() {
- DynamicDatasourceData dynamicDatasourceData = dynamicDatasourceDataMapper.selectOne(null);
- return dynamicDatasourceData.getSourceName();
- }
-
-
- /**
- * 验证一下事物控制
- */
-// @Transactional(rollbackFor = Exception.class)
- @DS(value = "slave")
- @GetMapping("/dbTestTransactional")
- public void dbTestTransactional() {
-
- DynamicDatasourceData datasourceData = new DynamicDatasourceData();
- datasourceData.setSourceName("test");
- dynamicDatasourceDataMapper.insert(datasourceData);
-
- DynamicDatasourceData datasourceData1 = new DynamicDatasourceData();
- datasourceData1.setSourceName("testtesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttest");
- dynamicDatasourceDataMapper.insert(datasourceData1);
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/dao/DynamicDatasourceDataMapper.java" "b/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/dao/DynamicDatasourceDataMapper.java"
deleted file mode 100644
index 80311733..00000000
--- "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/dao/DynamicDatasourceDataMapper.java"
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.dynamic.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dynamic.entity.DynamicDatasourceData;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface DynamicDatasourceDataMapper extends BaseMapper {
-}
\ No newline at end of file
diff --git "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/entity/DynamicDatasourceData.java" "b/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/entity/DynamicDatasourceData.java"
deleted file mode 100644
index 2fa0a61e..00000000
--- "a/springboot101/\346\225\260\346\215\256\345\272\223/springboot-dynamic-datasource/src/main/java/com/dynamic/entity/DynamicDatasourceData.java"
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dynamic.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@TableName("t_dynamic_datasource_data")
-@Data
-public class DynamicDatasourceData {
-
- private Long id;
- private String sourceName;
-}
diff --git "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/.gitignore" "b/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/.gitignore"
deleted file mode 100644
index 4fd45a21..00000000
--- "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/.gitignore"
+++ /dev/null
@@ -1,37 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**
-!**/src/test/**
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-
-### VS Code ###
-.vscode/
-!/.mvn/
-!/HELP.md
-
-!/mvnw
-
-!/mvnw.cmd
diff --git "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/README.md" "b/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/README.md"
deleted file mode 100644
index 41be58b4..00000000
--- "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/README.md"
+++ /dev/null
@@ -1,3 +0,0 @@
-### 本案例对应的文章教程
-
-[Springboot 一行代码实现文件上传 20个平台！少写代码到极致](http://mp.weixin.qq.com/s?__biz=MzAxNTM4NzAyNg==&mid=2247502313&idx=1&sn=7ce4a41b0ae9533082e54ace1863d8bc&chksm=9b865914acf1d002127726552e86b3a03816fe915ec56abf779f4801b8d0ec07ee3c367a9dfe&token=755618913&lang=zh_CN#rd)
\ No newline at end of file
diff --git "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/pom.xml" "b/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/pom.xml"
deleted file mode 100644
index 5ea219fc..00000000
--- "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/pom.xml"
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
- springboot-file-storage
- 0.0.1-SNAPSHOT
- springboot-file-storage
-
-
-
-
-
- cn.xuyanwu
- spring-file-storage
- 0.5.0
-
-
-
-
- com.aliyun.oss
- aliyun-sdk-oss
- 3.10.2
-
-
-
-
diff --git "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/src/main/java/com/springboot101/SpringbootFileStorageApplication.java" "b/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/src/main/java/com/springboot101/SpringbootFileStorageApplication.java"
deleted file mode 100644
index d6c95e75..00000000
--- "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/src/main/java/com/springboot101/SpringbootFileStorageApplication.java"
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.springboot101;
-
-import cn.xuyanwu.spring.file.storage.EnableFileStorage;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@EnableFileStorage // 文件上传工具
-@SpringBootApplication
-public class SpringbootFileStorageApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(SpringbootFileStorageApplication.class, args);
- }
-}
diff --git "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/src/main/java/com/springboot101/controller/FileController.java" "b/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/src/main/java/com/springboot101/controller/FileController.java"
deleted file mode 100644
index a0b6a7d0..00000000
--- "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/src/main/java/com/springboot101/controller/FileController.java"
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-package com.springboot101.controller;
-
-import cn.xuyanwu.spring.file.storage.FileInfo;
-import cn.xuyanwu.spring.file.storage.FileStorageService;
-import cn.xuyanwu.spring.file.storage.ProgressListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.ByteArrayOutputStream;
-
-/**
- * 公众号：程序员小富
- * 上传文件Controller
- */
-@RestController
-public class FileController {
- @Autowired
- private FileStorageService fileStorageService;
-
- /**
- * 公众号：程序员小富
- * 上传文件
- */
- @PostMapping(value = {"/upload"})
- public Object upload(MultipartFile file) {
- FileInfo upload = fileStorageService.of(file).upload();
- return upload;
- }
-
- /**
- * 公众号：程序员小富
- * 上传图片裁剪大小并生成一张缩略图
- */
- @PostMapping("/uploadThumbnail")
- public FileInfo uploadThumbnail(MultipartFile file) {
- return fileStorageService.of(file)
- .image(img -> img.size(1000, 1000)) //将图片大小调整到 1000*1000
- .thumbnail(th -> th.size(200, 200)) //再生成一张 200*200 的缩略图
- .upload();
- }
-
- /**
- * 公众号：程序员小富
- * 上传文件到指定存储平台，成功返回文件信息
- */
- @PostMapping("/upload-platform")
- public FileInfo uploadPlatform(MultipartFile file) {
- return fileStorageService.of(file)
- .setPlatform("aliyun-oss") //使用指定的存储平台
- .upload();
- }
-
- /**
- * 公众号：程序员小富
- * 下载文件
- */
- @PostMapping("/download")
- public void download(MultipartFile file) {
- // 获取文件信息
- FileInfo fileInfo = fileStorageService.getFileInfoByUrl("http://file.abc.com/test/a.jpg");
-
- // 下载为字节数组
- byte[] bytes = fileStorageService.download(fileInfo).bytes();
-
- // 下载到文件
- fileStorageService.download(fileInfo).file("C:\\a.jpg");
-
- // 下载到 OutputStream 中
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- fileStorageService.download(fileInfo).outputStream(out);
-
- // 获取 InputStream 手动处理
- fileStorageService.download(fileInfo).inputStream(in -> {
- //TODO 读取 InputStream
- });
-
- // 直接通过文件信息中的 url 下载，省去手动查询文件信息记录的过程
- fileStorageService.download("http://file.abc.com/test/a.jpg").file("C:\\a.jpg");
-
- // 下载缩略图
- fileStorageService.downloadTh(fileInfo).file("C:\\th.jpg");
-
- // 下载文件 显示进度
- fileStorageService.download(fileInfo).setProgressMonitor(new ProgressListener() {
- @Override
- public void start() {
- System.out.println("下载开始");
- }
-
- @Override
- public void progress(long progressSize,long allSize) {
- System.out.println("已下载 " + progressSize + " 总大小" + allSize);
- }
-
- @Override
- public void finish() {
- System.out.println("下载结束");
- }
- }).file("C:\\a.jpg");
- }
-}
diff --git "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/src/main/java/com/springboot101/service/LogFileStorageAspect.java" "b/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/src/main/java/com/springboot101/service/LogFileStorageAspect.java"
deleted file mode 100644
index 590a8f28..00000000
--- "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/src/main/java/com/springboot101/service/LogFileStorageAspect.java"
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.springboot101.service;
-
-import cn.xuyanwu.spring.file.storage.FileInfo;
-import cn.xuyanwu.spring.file.storage.UploadPretreatment;
-import cn.xuyanwu.spring.file.storage.aspect.*;
-import cn.xuyanwu.spring.file.storage.platform.FileStorage;
-import cn.xuyanwu.spring.file.storage.recorder.FileRecorder;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.io.InputStream;
-import java.util.function.Consumer;
-
-/**
- * 使用切面打印文件上传和删除的日志
- */
-@Slf4j
-@Component
-public class LogFileStorageAspect implements FileStorageAspect {
-
- /**
- * 上传，成功返回文件信息，失败返回 null
- */
- @Override
- public FileInfo uploadAround(UploadAspectChain chain, FileInfo fileInfo, UploadPretreatment pre, FileStorage fileStorage, FileRecorder fileRecorder) {
- log.info("上传文件 before -> {}",fileInfo);
- fileInfo = chain.next(fileInfo,pre,fileStorage,fileRecorder);
- log.info("上传文件 after -> {}",fileInfo);
- return fileInfo;
- }
-
- /**
- * 删除文件，成功返回 true
- */
- @Override
- public boolean deleteAround(DeleteAspectChain chain, FileInfo fileInfo, FileStorage fileStorage, FileRecorder fileRecorder) {
- log.info("删除文件 before -> {}",fileInfo);
- boolean res = chain.next(fileInfo,fileStorage,fileRecorder);
- log.info("删除文件 after -> {}",res);
- return res;
- }
-
- /**
- * 文件是否存在
- */
- @Override
- public boolean existsAround(ExistsAspectChain chain, FileInfo fileInfo, FileStorage fileStorage) {
- log.info("文件是否存在 before -> {}",fileInfo);
- boolean res = chain.next(fileInfo,fileStorage);
- log.info("文件是否存在 after -> {}",res);
- return res;
- }
-
- /**
- * 下载文件
- */
- @Override
- public void downloadAround(DownloadAspectChain chain, FileInfo fileInfo, FileStorage fileStorage, Consumer consumer) {
- log.info("下载文件 before -> {}",fileInfo);
- chain.next(fileInfo,fileStorage,consumer);
- log.info("下载文件 after -> {}",fileInfo);
- }
-
- /**
- * 下载缩略图文件
- */
- @Override
- public void downloadThAround(DownloadThAspectChain chain,FileInfo fileInfo,FileStorage fileStorage,Consumer consumer) {
- log.info("下载缩略图文件 before -> {}",fileInfo);
- chain.next(fileInfo,fileStorage,consumer);
- log.info("下载缩略图文件 after -> {}",fileInfo);
- }
-}
-
diff --git "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/src/main/resources/application.yml" "b/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/src/main/resources/application.yml"
deleted file mode 100644
index 5db96fd9..00000000
--- "a/springboot101/\346\226\207\344\273\266\346\223\215\344\275\234/springboot-file-storage/src/main/resources/application.yml"
+++ /dev/null
@@ -1,25 +0,0 @@
-server:
- port: 3333
-
-
-spring:
- #文件存储配置(本地、oss)
- file-storage:
- default-platform: local-1
- thumbnail-suffix: ".min.jpg" #缩略图后缀
- local:
- - platform: local-1 # 存储平台标识
- enable-storage: true #是否开启本存储（只能选一种）
- enable-access: true #启用访问（线上请使用 Nginx 配置，效率更高）
- domain: "http://127.0.0.1:2222/" #访问域名，注意后面要和path-patterns保持一致，“/”结尾
- base-path: /tmp/Pictures/ # 存储地址
- path-patterns: /** #访问路径
- aliyun-oss:
- - platform: aliyun-oss
- enable-storage: true
- access-key: xxxx
- secret-key: xxxx
- end-point: xxx
- bucket-name: firebook
- domain: http://fire100.top
- base-path: #云平台文件路径
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.gitignore" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.gitignore"
deleted file mode 100644
index 724f6033..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.gitignore"
+++ /dev/null
@@ -1,35 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-!/.idea/
-!/.idea/
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/.gitignore" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/.gitignore"
deleted file mode 100644
index 26d33521..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/.gitignore"
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/encodings.xml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/encodings.xml"
deleted file mode 100644
index aa00ffab..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/encodings.xml"
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/jarRepositories.xml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/jarRepositories.xml"
deleted file mode 100644
index f0b4cc9c..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/jarRepositories.xml"
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/misc.xml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/misc.xml"
deleted file mode 100644
index d5cd6143..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/misc.xml"
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/uiDesigner.xml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/uiDesigner.xml"
deleted file mode 100644
index 2b63946d..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/.idea/uiDesigner.xml"
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/README.md" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/README.md"
deleted file mode 100644
index e7631789..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/README.md"
+++ /dev/null
@@ -1,5 +0,0 @@
-此项目为 springboot 脚手架
-
-已经整合了 jpa 连接mysql，自动根据JAVA实体属性创建对应的表
-
-起新项目直接复制它即可
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/pom.xml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/pom.xml"
deleted file mode 100644
index 11b0cf65..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/pom.xml"
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- 4.0.0
-
- com.notebook
- Springboot-Notebook
- 0.0.1-SNAPSHOT
-
- springboot-jsp
- 0.0.1-SNAPSHOT
- springboot-jsp
-
-
-
-
-
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/BaseApplication.java" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/BaseApplication.java"
deleted file mode 100644
index a3fc7929..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/BaseApplication.java"
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class BaseApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(BaseApplication.class, args);
- }
-
-}
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/controller/TestController.java" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/controller/TestController.java"
deleted file mode 100644
index 43f9f057..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/controller/TestController.java"
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.springboot101.controller;
-
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class TestController {
-
- @GetMapping("/test")
- public String test() {
-
- return "test";
- }
-}
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/po/User.java" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/po/User.java"
deleted file mode 100644
index c7ef1048..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/po/User.java"
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.springboot101.po;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.*;
-import java.util.Date;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Entity
-@Table(name = "t_user")
-public class User {
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- private Long id;
-
- private String name;
-
- private Integer age;
-
- private String email;
-
- @Column(name = "create_time")
- private Date createTime;
-
- @Column(name = "update_time")
- private Date updateTime;
-}
-
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/repository/UserRepository.java" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/repository/UserRepository.java"
deleted file mode 100644
index 00ff5559..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/repository/UserRepository.java"
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.springboot101.repository;
-
-import com.springboot101.po.User;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface UserRepository extends JpaRepository {
-}
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/service/UserService.java" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/service/UserService.java"
deleted file mode 100644
index 2ed82c81..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/java/com/springboot101/service/UserService.java"
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.springboot101.service;
-
-import com.springboot101.po.User;
-import com.springboot101.repository.UserRepository;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-@Component
-public class UserService {
-
- @Resource
- private UserRepository userRepository;
-
-
- public void insertUser(User user){
-
- userRepository.save(user);
- }
-}
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/resources/application.yml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/resources/application.yml"
deleted file mode 100644
index 6de67352..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/resources/application.yml"
+++ /dev/null
@@ -1,19 +0,0 @@
-server:
- port: 6666
-
-
-spring:
- # 数据库连接信息
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/db_1?useSSL=false&serverTimezone=UTC&characterEncoding=UTF-8
- username: root
- password: 123456
-
- jpa:
- hibernate:
- ddl-auto: update
- properties:
- hibernate:
- dialect: org.hibernate.dialect.MySQL5InnoDBDialect
- show-sql: true
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/resources/static/index.html" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/resources/static/index.html"
deleted file mode 100644
index e2d94a21..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/main/resources/static/index.html"
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- hello word!!!
- this is a html page
-
-
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/test/java/com/springboot101/BaseShare.java" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/test/java/com/springboot101/BaseShare.java"
deleted file mode 100644
index 78266ff4..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-jsp/src/test/java/com/springboot101/BaseShare.java"
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.springboot101;
-
-import java.util.Date;
-
-import com.springboot101.po.User;
-import com.springboot101.service.UserService;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import javax.annotation.Resource;
-
-@SpringBootTest
-class BaseShare {
-
- @Resource
- private UserService userService;
-
- @Test
- public void userServiceTest() {
- User user = new User();
- user.setName("公众号：程序员小富");
- user.setAge(0);
- user.setEmail("vx：xinzhifu521");
- user.setCreateTime(new Date());
- user.setUpdateTime(new Date());
- userService.insertUser(user);
- }
-}
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.gitignore" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.gitignore"
deleted file mode 100644
index 724f6033..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.gitignore"
+++ /dev/null
@@ -1,35 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-!/.idea/
-!/.idea/
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/.gitignore" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/.gitignore"
deleted file mode 100644
index 26d33521..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/.gitignore"
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/compiler.xml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/compiler.xml"
deleted file mode 100644
index 2f55cb63..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/compiler.xml"
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/encodings.xml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/encodings.xml"
deleted file mode 100644
index aa00ffab..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/encodings.xml"
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/jarRepositories.xml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/jarRepositories.xml"
deleted file mode 100644
index f0b4cc9c..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/jarRepositories.xml"
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/misc.xml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/misc.xml"
deleted file mode 100644
index d5cd6143..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/misc.xml"
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/uiDesigner.xml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/uiDesigner.xml"
deleted file mode 100644
index 2b63946d..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/.idea/uiDesigner.xml"
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/README.md" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/README.md"
deleted file mode 100644
index e7631789..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/README.md"
+++ /dev/null
@@ -1,5 +0,0 @@
-此项目为 springboot 脚手架
-
-已经整合了 jpa 连接mysql，自动根据JAVA实体属性创建对应的表
-
-起新项目直接复制它即可
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/pom.xml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/pom.xml"
deleted file mode 100644
index be3f5e51..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/pom.xml"
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- 4.0.0
-
- com.notebook
- Springboot-Notebook
- 0.0.1-SNAPSHOT
-
- springboot-thymeleaf
- 0.0.1-SNAPSHOT
- springboot-thymeleaf
-
-
-
- org.springframework.boot
- spring-boot-starter-thymeleaf
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
-
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/src/main/java/com/springboot101/ThymeleafApplication.java" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/src/main/java/com/springboot101/ThymeleafApplication.java"
deleted file mode 100644
index acd714a8..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/src/main/java/com/springboot101/ThymeleafApplication.java"
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class ThymeleafApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(ThymeleafApplication.class, args);
- }
-
-}
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/src/main/java/com/springboot101/controller/TestController.java" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/src/main/java/com/springboot101/controller/TestController.java"
deleted file mode 100644
index e44f95e4..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/src/main/java/com/springboot101/controller/TestController.java"
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.springboot101.controller;
-
-
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.util.Arrays;
-import java.util.List;
-
-@Controller
-public class TestController {
-
- @GetMapping("/example")
- public ModelAndView example(ModelAndView modelAndView) {
- List fruits = Arrays.asList("Apple", "Banana", "Orange");
- modelAndView.setViewName("fruits");
- modelAndView.addObject("fruits", fruits);
- return modelAndView;
- }
-
- @GetMapping("/example1")
- public String example1(Model model) {
- List fruits = Arrays.asList("Apple", "Banana", "Orange");
- model.addAttribute("fruits", fruits);
- return "fruits.html";
- }
-
- @GetMapping("/example2")
- public String example2(Model model) {
- List fruits = Arrays.asList("Apple", "Banana", "Orange");
- model.addAttribute("fruits", fruits);
- return "fruits";
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/src/main/resources/application.yml" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/src/main/resources/application.yml"
deleted file mode 100644
index 6d3c2346..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/src/main/resources/application.yml"
+++ /dev/null
@@ -1,11 +0,0 @@
-server:
- port: 6666
-
-
-spring:
- thymeleaf:
- cache: false
- prefix: classpath:/templates/
- encoding: UTF-8 #编码
- suffix: .html #模板后缀
- mode: HTML #模板
diff --git "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/src/main/resources/templates/fruits.html" "b/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/src/main/resources/templates/fruits.html"
deleted file mode 100644
index ab08a4da..00000000
--- "a/springboot101/\346\250\241\347\211\210\345\274\225\346\223\216/springboot-thymeleaf/src/main/resources/templates/fruits.html"
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Example Page
-
-
-
-Welcome to Thymeleaf Example Page
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.gitignore" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.gitignore"
deleted file mode 100644
index b0c0ffdf..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.gitignore"
+++ /dev/null
@@ -1,36 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-!/.idea/
-!/.idea/
-!/.idea/
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/.gitignore" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/.gitignore"
deleted file mode 100644
index 26d33521..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/.gitignore"
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/compiler.xml" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/compiler.xml"
deleted file mode 100644
index 2f55cb63..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/compiler.xml"
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/encodings.xml" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/encodings.xml"
deleted file mode 100644
index aa00ffab..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/encodings.xml"
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/jarRepositories.xml" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/jarRepositories.xml"
deleted file mode 100644
index f0b4cc9c..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/jarRepositories.xml"
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/misc.xml" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/misc.xml"
deleted file mode 100644
index d5cd6143..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/misc.xml"
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/uiDesigner.xml" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/uiDesigner.xml"
deleted file mode 100644
index 2b63946d..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/.idea/uiDesigner.xml"
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/README.md" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/README.md"
deleted file mode 100644
index 47a4e041..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/README.md"
+++ /dev/null
@@ -1 +0,0 @@
-9 种方式获取配置文件的属性变量
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/pom.xml" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/pom.xml"
deleted file mode 100644
index 5a71dacc..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/pom.xml"
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
- springboot-design-chain
- 0.0.1-SNAPSHOT
- springboot-design-chain
-
-
-
-
-
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/Application.java" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/Application.java"
deleted file mode 100644
index 0637184c..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/Application.java"
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class Application {
-
- public static void main(String[] args) {
- SpringApplication.run(Application.class, args);
- }
-}
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/domain/OrderContext.java" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/domain/OrderContext.java"
deleted file mode 100644
index 91025936..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/domain/OrderContext.java"
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.springboot101.domain;
-
-import lombok.Data;
-
-/**
- * 订单责任链处理器
- *
- * @author 公众号：程序员小富
- * @date 2023/07/03 11:02
- */
-@Data
-public class OrderContext {
-
- /**
- * 请求唯一序列ID
- */
- private String seqId;
-
- /**
- * 用户ID
- */
- private String userId;
-
- /**
- * 产品skuId
- */
- private Long skuId;
-
- /**
- * 下单数量
- */
- private Integer amount;
-}
\ No newline at end of file
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/handler/AbstractOrderHandler.java" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/handler/AbstractOrderHandler.java"
deleted file mode 100644
index 3228f099..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/handler/AbstractOrderHandler.java"
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.springboot101.handler;
-
-import com.springboot101.domain.OrderContext;
-
-/**
- * 订单责任链处理器
- *
- * @author 公众号：程序员小富
- * @date 2023/07/03 11:02
- */
-public abstract class AbstractOrderHandler {
-
- /**
- * 责任链，下一个链接节点
- */
- private AbstractOrderHandler next;
-
- /**
- * 执行入口
- *
- * @param context
- */
- public boolean execute(OrderContext context) {
- boolean flag = handle(context);
- // 判断是否还有下个责任链节点，没有的话，说明已经是最后一个节点
- if (getNext() != null) {
- getNext().execute(context);
- }
- return flag;
- }
-
- /**
- * 对参数进行处理
- *
- * @param context
- * @return
- */
- public abstract boolean handle(OrderContext context);
-
-
- public AbstractOrderHandler getNext() {
- return next;
- }
-
- public void setNext(AbstractOrderHandler next) {
- this.next = next;
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/handler/RepeatOrderHandler.java" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/handler/RepeatOrderHandler.java"
deleted file mode 100644
index 76cdfb8f..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/handler/RepeatOrderHandler.java"
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.springboot101.handler;
-
-import com.springboot101.domain.OrderContext;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-
-/**
- * 订单重复下单处理器
- *
- * @author 公众号：程序员小富
- * @date 2023/07/03 11:02
- */
-@Order(2)
-@Component
-public class RepeatOrderHandler extends AbstractOrderHandler {
-
- @Override
- public boolean handle(OrderContext context) {
- // redis get SeqId value
- if (true) {
- System.out.println("请勿重复下单！");
- return false;
- }
- return true;
- }
-}
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/handler/ValidOrderHandler.java" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/handler/ValidOrderHandler.java"
deleted file mode 100644
index 5f0fff33..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/handler/ValidOrderHandler.java"
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.springboot101.handler;
-
-import com.springboot101.domain.OrderContext;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-/**
- * 订单参数校验处理器
- *
- * @author 公众号：程序员小富
- * @date 2023/07/03 11:02
- */
-@Order(1)
-@Component
-public class ValidOrderHandler extends AbstractOrderHandler {
-
- @Override
- public boolean handle(OrderContext context) {
- if (context.getAmount() < 0) {
- System.out.println("下单数量超出限定，请检查参数！");
- return false;
- }
- return true;
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/manager/OrderHandleManager.java" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/manager/OrderHandleManager.java"
deleted file mode 100644
index 6b9d7934..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/java/com/springboot101/manager/OrderHandleManager.java"
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.springboot101.manager;
-
-import com.springboot101.domain.OrderContext;
-import com.springboot101.handler.AbstractOrderHandler;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.util.List;
-
-
-/**
- * 订单处理器管理器
- *
- * @author 公众号：程序员小富
- * @date 2023/07/03 11:02
- */
-@Component
-public class OrderHandleManager {
-
- @Autowired
- private List orderHandleList;
-
- @PostConstruct
- public void init() {
-
- /**
- * 如果处理器List没有按照 @Order 注解方式排序，我们可以通过如下方式手动排序
- */
- // orderHandleList.sort(AnnotationAwareOrderComparator.INSTANCE);
-
- int size = orderHandleList.size();
- for (int i = 0; i < size; i++) {
- AbstractOrderHandler currentHandler = orderHandleList.get(i);
- if (i == size - 1) {
- currentHandler.setNext(null);
- } else {
- currentHandler.setNext(orderHandleList.get(i + 1));
- }
- }
- }
-
- public boolean execute(OrderContext context) {
- return orderHandleList.get(0).execute(context);
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/resources/application.yml" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/resources/application.yml"
deleted file mode 100644
index 89d5604a..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/main/resources/application.yml"
+++ /dev/null
@@ -1,11 +0,0 @@
-server:
- port: 6667
-
-env101:
- var1: var1-公众号：程序员小富
- var2: var2-公众号：程序员小富
- var3: var3-公众号：程序员小富
- var4: var4-公众号：程序员小富
- var5: var5-公众号：程序员小富
- var6: var6-公众号：程序员小富
- var7: var7-公众号：程序员小富
diff --git "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/test/java/com/springboot101/ChainTest.java" "b/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/test/java/com/springboot101/ChainTest.java"
deleted file mode 100644
index 4c34dc2e..00000000
--- "a/springboot101/\350\256\276\350\256\241\346\250\241\345\274\217/springboot-design-chain/src/test/java/com/springboot101/ChainTest.java"
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.springboot101;
-
-
-import com.springboot101.domain.OrderContext;
-import com.springboot101.manager.OrderHandleManager;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@Slf4j
-@SpringBootTest
-public class ChainTest {
-
- @Autowired
- private OrderHandleManager orderHandleManager;
-
- @Test
- public void test(){
- boolean execute = orderHandleManager.execute(new OrderContext());
- System.out.println(execute);
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-aop-unifiedlog/.gitignore" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-aop-unifiedlog/.gitignore"
deleted file mode 100644
index 724f6033..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-aop-unifiedlog/.gitignore"
+++ /dev/null
@@ -1,35 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-!/.idea/
-!/.idea/
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-aop-unifiedlog/pom.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-aop-unifiedlog/pom.xml"
deleted file mode 100644
index 4f7ee875..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-aop-unifiedlog/pom.xml"
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
- springboot-aop-unifiedlog
- 0.0.1-SNAPSHOT
- springboot-aop-unifiedlog
-
-
-
-
- org.springframework.boot
- spring-boot-starter-aop
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
-
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-aop-unifiedlog/src/main/java/com/springboot101/controller/OrderController.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-aop-unifiedlog/src/main/java/com/springboot101/controller/OrderController.java"
deleted file mode 100644
index 6cf1e7b0..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-aop-unifiedlog/src/main/java/com/springboot101/controller/OrderController.java"
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.springboot101.controller;
-
-
-import com.springboot101.config.PrintlnLog;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@RestController
-@RequestMapping
-public class OrderController {
-
-
- @PrintlnLog(description = "订单详情Controller")
- @RequestMapping("/order")
- public void getOrder(String name) {
-
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-aop-unifiedlog/src/main/resources/application.yml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-aop-unifiedlog/src/main/resources/application.yml"
deleted file mode 100644
index 8845751d..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-aop-unifiedlog/src/main/resources/application.yml"
+++ /dev/null
@@ -1,3 +0,0 @@
-server:
- port: 6668
-
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-banner/pom.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-banner/pom.xml"
deleted file mode 100644
index c5ce650c..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-banner/pom.xml"
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
-
- springboot-banner
-
-
- 8
- 8
-
-
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-banner/src/main/java/com/springboot101/BannerApplication.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-banner/src/main/java/com/springboot101/BannerApplication.java"
deleted file mode 100644
index 15d2adc2..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-banner/src/main/java/com/springboot101/BannerApplication.java"
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
-
-@SpringBootApplication
-public class BannerApplication {
-
- public static void main(String[] args) {
- ConfigurableApplicationContext run = SpringApplication.run(BannerApplication.class, args);
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-banner/src/main/resources/application.yml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-banner/src/main/resources/application.yml"
deleted file mode 100644
index 9a41d8ef..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-banner/src/main/resources/application.yml"
+++ /dev/null
@@ -1,3 +0,0 @@
-server:
- port: 9004
-
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-banner/src/main/resources/banner.txt" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-banner/src/main/resources/banner.txt"
deleted file mode 100644
index 8dc80673..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-banner/src/main/resources/banner.txt"
+++ /dev/null
@@ -1,23 +0,0 @@
-${AnsiColor.BRIGHT_GREEN}$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
-${AnsiColor.BRIGHT_YELLOW}$$ _.ooOoo._ $$
-${AnsiColor.BRIGHT_RED}$$ o888888888o $$
-${AnsiColor.BRIGHT_CYAN}$$ 88" . "88 $$
-${AnsiColor.BRIGHT_MAGENTA}$$ (| ^_^ |) $$
-${AnsiColor.BRIGHT_GREEN}$$ O\ = /O $$
-${AnsiColor.BRIGHT_RED}$$ ____/`-----'\____ $$
-${AnsiColor.BRIGHT_CYAN}$$ .' \\| |$$ `. $$
-${AnsiColor.BRIGHT_MAGENTA}$$ / \\||| : |||$$ \ $$
-${AnsiColor.BRIGHT_GREEN}$$ / _||||| -:- |||||- \ $$
-${AnsiColor.BRIGHT_YELLOW}$$ | | \\\ - $$/ | | $$
-${AnsiColor.BRIGHT_GREEN}$$ | \_| ''\-----/'' | | $$
-${AnsiColor.BRIGHT_YELLOW}$$ \ .-\___ `-` ____/-. / $$
-${AnsiColor.BRIGHT_CYAN}$$ ___`. .' /--.--\ `. . ___ $$
-${AnsiColor.BRIGHT_RED}$$ ."" '< `.____\_<|>_/____.' >'"". $$
-${AnsiColor.BRIGHT_GREEN}$$ | | : `- \`.;`.\ _ /``;.`/ - ` : | | $$
-${AnsiColor.BRIGHT_YELLOW}$$ \ \ `-. \_ ___\ /___ _/ .-` / / $$
-${AnsiColor.BRIGHT_CYAN}$$ ========`-.____`-.____\_____/____.-`____.-'======== $$
-${AnsiColor.BRIGHT_MAGENTA}$$ `=---=' $$
-${AnsiColor.BRIGHT_YELLOW}$$ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ $$
-${AnsiColor.BRIGHT_GREEN}$$ 佛祖保佑 永无BUG 永不修改 $$
-${AnsiColor.BRIGHT_YELLOW}$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
- ${AnsiColor.BRIGHT_YELLOW}Spring Boot: ${spring-boot.formatted-version}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/README.md" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/README.md"
deleted file mode 100644
index cb80a2fb..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/README.md"
+++ /dev/null
@@ -1 +0,0 @@
-springboot注解实现动态数据源切换
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/pom.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/pom.xml"
deleted file mode 100644
index fef7869d..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/pom.xml"
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
- 4.0.0
-
- org.springframework.boot
- spring-boot-starter-parent
- 2.7.6
-
- com.dynamic
- springboot-config-order
- 0.0.1-SNAPSHOT
-
- 8
- 8
- 3.5.3.1
- 8.0.32
- 1.2.6
-
-
-
-
- org.springframework.boot
- spring-boot-starter
-
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
-
- com.mysql
- mysql-connector-j
- ${mysql.connector.version}
-
-
-
- org.projectlombok
- lombok
- true
-
-
-
- com.baomidou
- mybatis-plus-boot-starter
- ${mybatis.plus.version}
-
-
-
- com.alibaba
- druid-spring-boot-starter
- ${druid.version}
-
-
- org.apache.commons
- commons-lang3
- 3.7
-
-
- org.aspectj
- aspectjweaver
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/DynamicDatasourceApplication.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/DynamicDatasourceApplication.java"
deleted file mode 100644
index 75592071..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/DynamicDatasourceApplication.java"
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.dynamic;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-
-@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
-public class DynamicDatasourceApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(DynamicDatasourceApplication.class, args);
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/aspect/DS.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/aspect/DS.java"
deleted file mode 100644
index 9e1367e7..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/aspect/DS.java"
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.dynamic.aspect;
-
-import java.lang.annotation.*;
-
-/**
- * 定于数据源切换注解
- *
- * @author 公众号：程序员小富
- * @date 2023/11/27 11:02
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-public @interface DS {
- // 默认数据源master
- String value() default "master";
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/aspect/DSAspect.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/aspect/DSAspect.java"
deleted file mode 100644
index abbb28eb..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/aspect/DSAspect.java"
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dynamic.aspect;
-
-import com.dynamic.config.DataSourceContextHolder;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Method;
-import java.util.Objects;
-
-/**
- * 实现@DS注解的AOP切面
- *
- * @author 公众号：程序员小富
- * @date 2023/11/27 11:02
- */
-@Aspect
-@Component
-@Slf4j
-public class DSAspect {
-
- @Pointcut("@annotation(com.dynamic.aspect.DS)")
- public void dynamicDataSource() {
- }
-
- @Around("dynamicDataSource()")
- public Object datasourceAround(ProceedingJoinPoint point) throws Throwable {
- MethodSignature signature = (MethodSignature) point.getSignature();
- Method method = signature.getMethod();
- DS ds = method.getAnnotation(DS.class);
- if (Objects.nonNull(ds)) {
- DataSourceContextHolder.setDataSource(ds.value());
- }
- try {
- return point.proceed();
- } finally {
- DataSourceContextHolder.removeDataSource();
- }
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/config/DataSourceContextHolder.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/config/DataSourceContextHolder.java"
deleted file mode 100644
index e00d3981..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/config/DataSourceContextHolder.java"
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.dynamic.config;
-
-/**
- * ThreadLocal存放数据源变量
- *
- * @author 公众号：程序员小富
- * @date 2023/11/27 11:02
- */
-public class DataSourceContextHolder {
-
- private static final ThreadLocal DATASOURCE_HOLDER = new ThreadLocal<>();
-
- /**
- * 获取当前线程的数据源
- *
- * @return 数据源名称
- */
- public static String getDataSource() {
- return DATASOURCE_HOLDER.get();
- }
-
- /**
- * 设置数据源
- *
- * @param dataSourceName 数据源名称
- */
- public static void setDataSource(String dataSourceName) {
- DATASOURCE_HOLDER.set(dataSourceName);
- }
-
- /**
- * 删除当前数据源
- */
- public static void removeDataSource() {
- DATASOURCE_HOLDER.remove();
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/config/DateSourceConfig.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/config/DateSourceConfig.java"
deleted file mode 100644
index 11c9c1fd..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/config/DateSourceConfig.java"
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dynamic.config;
-
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-import javax.sql.DataSource;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 注册多个数据源
- *
- * @author 公众号：程序员小富
- * @date 2023/11/27 11:02
- */
-@Configuration
-public class DateSourceConfig {
-
- @Bean
- @ConfigurationProperties("spring.datasource.druid.master")
- public DataSource dynamicDatasourceMaster() {
- return DruidDataSourceBuilder.create().build();
- }
-
- @Bean
- @ConfigurationProperties("spring.datasource.druid.slave")
- public DataSource dynamicDatasourceSlave() {
- return DruidDataSourceBuilder.create().build();
- }
-
- @Bean(name = "dynamicDataSource")
- @Primary
- public DynamicDataSource createDynamicDataSource() {
- Map dataSourceMap = new HashMap<>();
- // 设置默认的数据源为Master
- DataSource defaultDataSource = dynamicDatasourceMaster();
- dataSourceMap.put("master", defaultDataSource);
- dataSourceMap.put("slave", dynamicDatasourceSlave());
- return new DynamicDataSource(defaultDataSource, dataSourceMap);
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/config/DynamicDataSource.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/config/DynamicDataSource.java"
deleted file mode 100644
index 7f22cf36..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/config/DynamicDataSource.java"
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.dynamic.config;
-
-import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
-
-import javax.sql.DataSource;
-import java.util.Map;
-
-/**
- * 继承 AbstractRoutingDataSource
- * 重置当前的数据库路由，实现切换成想要执行的目标数据库
- *
- * @author 公众号：程序员小富
- * @date 2023/11/27 11:02
- */
-public class DynamicDataSource extends AbstractRoutingDataSource {
-
- public DynamicDataSource(DataSource defaultDataSource, Map targetDataSources) {
- super.setDefaultTargetDataSource(defaultDataSource);
- super.setTargetDataSources(targetDataSources);
- }
-
- /**
- * 这一步是关键
- * @return
- */
- @Override
- protected Object determineCurrentLookupKey() {
- return DataSourceContextHolder.getDataSource();
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/controller/DynamicSwitchController.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/controller/DynamicSwitchController.java"
deleted file mode 100644
index db3c1315..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/controller/DynamicSwitchController.java"
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.dynamic.controller;
-
-import com.dynamic.aspect.DS;
-import com.dynamic.config.DataSourceContextHolder;
-import com.dynamic.dao.DynamicDatasourceDataMapper;
-import com.dynamic.entity.DynamicDatasourceData;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * 动态数据源切换
- *
- * @author 公众号：程序员小富
- * @date 2023/11/27 11:02
- */
-@RestController
-public class DynamicSwitchController {
-
- @Resource
- private DynamicDatasourceDataMapper dynamicDatasourceDataMapper;
-
- @GetMapping("/switchDataSource/{datasourceName}")
- public String switchDataSource(@PathVariable("datasourceName") String datasourceName) {
- DataSourceContextHolder.setDataSource(datasourceName);
- DynamicDatasourceData dynamicDatasourceData = dynamicDatasourceDataMapper.selectOne(null);
- DataSourceContextHolder.removeDataSource();
- return dynamicDatasourceData.getSourceName();
- }
-
- @DS(value = "master")
- @GetMapping("/dbMaster")
- public String dbMaster() {
- DynamicDatasourceData dynamicDatasourceData = dynamicDatasourceDataMapper.selectOne(null);
- return dynamicDatasourceData.getSourceName();
- }
-
- @DS(value = "slave")
- @GetMapping("/dbSlave")
- public String dbSlave() {
- DynamicDatasourceData dynamicDatasourceData = dynamicDatasourceDataMapper.selectOne(null);
- return dynamicDatasourceData.getSourceName();
- }
-
-
- /**
- * 验证一下事物控制
- */
-// @Transactional(rollbackFor = Exception.class)
- @DS(value = "slave")
- @GetMapping("/dbTestTransactional")
- public void dbTestTransactional() {
-
- DynamicDatasourceData datasourceData = new DynamicDatasourceData();
- datasourceData.setSourceName("test");
- dynamicDatasourceDataMapper.insert(datasourceData);
-
- DynamicDatasourceData datasourceData1 = new DynamicDatasourceData();
- datasourceData1.setSourceName("testtesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttesttest");
- dynamicDatasourceDataMapper.insert(datasourceData1);
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/dao/DynamicDatasourceDataMapper.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/dao/DynamicDatasourceDataMapper.java"
deleted file mode 100644
index 80311733..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/dao/DynamicDatasourceDataMapper.java"
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.dynamic.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dynamic.entity.DynamicDatasourceData;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface DynamicDatasourceDataMapper extends BaseMapper {
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/entity/DynamicDatasourceData.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/entity/DynamicDatasourceData.java"
deleted file mode 100644
index 2fa0a61e..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-config-order/src/main/java/com/dynamic/entity/DynamicDatasourceData.java"
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.dynamic.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@TableName("t_dynamic_datasource_data")
-@Data
-public class DynamicDatasourceData {
-
- private Long id;
- private String sourceName;
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-database-doc/.gitignore" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-database-doc/.gitignore"
deleted file mode 100644
index 59eee11f..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-database-doc/.gitignore"
+++ /dev/null
@@ -1,34 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-!/mvnw
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-database-doc/src/main/resources/application.yml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-database-doc/src/main/resources/application.yml"
deleted file mode 100644
index 6c5d27be..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-database-doc/src/main/resources/application.yml"
+++ /dev/null
@@ -1,8 +0,0 @@
-server:
- port: 6670
-spring:
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- username: root
- password: 123456
- url: jdbc:mysql://127.0.0.1:3306/ds-0?useUnicode=true&characterEncoding=UTF-8&useSSL=false
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/.gitignore" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/.gitignore"
deleted file mode 100644
index 5b548fd4..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/.gitignore"
+++ /dev/null
@@ -1,9 +0,0 @@
-# Created by .ignore support plugin (hsz.mobi)
-### Example order template template
-### Example order template
-
-# IntelliJ project files
-.idea
-*.iml
-out
-gen
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/README.md" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/README.md"
deleted file mode 100644
index 2264e6a5..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/README.md"
+++ /dev/null
@@ -1 +0,0 @@
-延时任务
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/deadLetterQueue/DeadLetterConfig.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/deadLetterQueue/DeadLetterConfig.java"
deleted file mode 100644
index 9a162860..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/deadLetterQueue/DeadLetterConfig.java"
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.springboot101.deadLetterQueue;
-
-import org.springframework.amqp.core.*;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-
-/**
- * @Author: 公众号：程序员小富
- * @Description:
- */
-@Configuration
-public class DeadLetterConfig {
-
- /**
- * 正常消费队列
- */
- @Bean
- public Queue messageQueue() {
- return new Queue(RabbitConstant.IOT_VIRTUAL_DEVICE_CLOSE_QUEUE);
- }
-
- /**
- * 正常消费交换机
- */
- @Bean
- public DirectExchange messageDirectExchange() {
- return new DirectExchange(RabbitConstant.IOT_VIRTUAL_DEVICE_CLOSE_EXCHANGE);
- }
-
- /**
- * 正常消费队列与交换机绑定
- */
- @Bean
- public Binding bingdingMessageExchangeAndQueue() {
-
- return BindingBuilder.bind(messageQueue()).to(messageDirectExchange()).with(RabbitConstant.IOT_VIRTUAL_DEVICE_CLOSE_QUEUE);
- }
-
- /**
- * 延时队列
- */
- @Bean
- public Queue delayMessageQueue() {
- return QueueBuilder
- .durable(RabbitConstant.IOT_VIRTUAL_DEVICE_DELAY_QUEUE)
- // 配置到期后转发的交换
- .withArgument("x-dead-letter-exchange", RabbitConstant.IOT_VIRTUAL_DEVICE_CLOSE_EXCHANGE)
- // 配置到期后转发的路由键
- .withArgument("x-dead-letter-routing-key", RabbitConstant.IOT_VIRTUAL_DEVICE_CLOSE_QUEUE)
- .build();
- }
-
- /**
- * 延时交换机
- */
- @Bean
- public DirectExchange delayMessageDirectExchange() {
-
- return new DirectExchange(RabbitConstant.IOT_VIRTUAL_DEVICE_DELAY_EXCHANGE);
- }
-
- /**
- * 延时队列与交换机绑定
- */
- @Bean
- public Binding bingdingDeadLetterExchangeAndQueue() {
- return BindingBuilder.bind(delayMessageQueue()).to(delayMessageDirectExchange()).with(RabbitConstant.IOT_VIRTUAL_DEVICE_DELAY_QUEUE);
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/deadLetterQueue/DeadLetterReceiverMessage.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/deadLetterQueue/DeadLetterReceiverMessage.java"
deleted file mode 100644
index 805a7d65..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/deadLetterQueue/DeadLetterReceiverMessage.java"
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.springboot101.deadLetterQueue;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Component;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * @Author: 公众号：程序员小富
- * @Description:
- */
-@Slf4j
-@Component
-@RabbitListener(queues = RabbitConstant.IOT_VIRTUAL_DEVICE_CLOSE_QUEUE)
-public class DeadLetterReceiverMessage {
-
- @RabbitHandler
- public void receiver(String val) {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- System.out.println("收到延时消息时间："+sdf.format(new Date()) + " Delay sent.");
- System.out.println("收到延时消息了:" + val);
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/deadLetterQueue/DeadLetterSendMessage.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/deadLetterQueue/DeadLetterSendMessage.java"
deleted file mode 100644
index 3e98502f..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/deadLetterQueue/DeadLetterSendMessage.java"
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.springboot101.deadLetterQueue;
-
-import org.springframework.amqp.core.AmqpTemplate;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-
-/**
- * @Author: 公众号：程序员小富
- * @Description:
- */
-@Component
-public class DeadLetterSendMessage {
-
- @Resource
- private AmqpTemplate amqpTemplate;
-
- public void send(String delayTimes) {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- amqpTemplate.convertAndSend(RabbitConstant.IOT_VIRTUAL_DEVICE_DELAY_EXCHANGE,RabbitConstant.IOT_VIRTUAL_DEVICE_DELAY_QUEUE, "大家好我是延迟数据" + delayTimes, message -> {
- message.getMessageProperties().setExpiration(delayTimes);
- System.out.println(sdf.format(new Date()) + " Delay sent.");
- return message;
- });
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/deadLetterQueue/RabbitConstant.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/deadLetterQueue/RabbitConstant.java"
deleted file mode 100644
index 94103c4c..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/deadLetterQueue/RabbitConstant.java"
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.springboot101.deadLetterQueue;
-
-/**
- * @Author: 公众号：程序员小富
- * @Description:
- */
-public @interface RabbitConstant {
-
- /**
- * 死信交换机
- */
- String IOT_VIRTUAL_DEVICE_DELAY_EXCHANGE = "ecej.iot.virtual.device.delay.exchange";
-
- /**
- * 死信队列
- */
- String IOT_VIRTUAL_DEVICE_DELAY_QUEUE = "ecej.iot.virtual.device.delay.queue";
-
- /**
- * 消费交换机
- */
- String IOT_VIRTUAL_DEVICE_CLOSE_EXCHANGE = "ecej.iot.virtual.device.close.exchange";
-
- /**
- * 消费队列
- */
- String IOT_VIRTUAL_DEVICE_CLOSE_QUEUE = "ecej.iot.virtual.device.close.queue";
-
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/redis/RedisDelayQueue.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/redis/RedisDelayQueue.java"
deleted file mode 100644
index 83238936..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/redis/RedisDelayQueue.java"
+++ /dev/null
@@ -1,101 +0,0 @@
-//package com.chengxy.delayqueue.redis;
-//
-//import redis.clients.jedis.Jedis;
-//import redis.clients.jedis.JedisPool;
-//import redis.clients.jedis.Tuple;
-//
-//import java.text.SimpleDateFormat;
-//import java.util.Calendar;
-//import java.util.Date;
-//import java.util.Set;
-//
-///**
-// * @Author: 公众号：程序员小富
-// * @Description:
-// */
-//public class RedisDelayQueue {
-//
-// private JedisPool jedisPool = null;
-// // Redis服务器IP
-// private String ADDR = "127.0.0.1";
-// // Redis的端口号
-// private int PORT = 6379;
-//
-// private static String DELAY_QUEUE = "delayqueue";
-//
-// private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//
-// public RedisDelayQueue() {
-// jedisPool = new JedisPool(ADDR, PORT);
-// }
-//
-// public static void main(String[] args) {
-//
-// RedisDelayQueue redisDelay = new RedisDelayQueue();
-// redisDelay.pushOrderQueue();
-// redisDelay.pollOrderQueue();
-// redisDelay.deleteZSet();
-// }
-//
-// public void deleteZSet() {
-// Jedis jedis = jedisPool.getResource();
-// jedis.del(DELAY_QUEUE);
-// }
-//
-// /**
-// * 消息入队
-// */
-// public void pushOrderQueue() {
-// Jedis jedis = jedisPool.getResource();
-// Calendar cal1 = Calendar.getInstance();
-// cal1.add(Calendar.SECOND, 10);
-// int order1 = (int) (cal1.getTimeInMillis() / 1000);
-//
-// Calendar cal2 = Calendar.getInstance();
-// cal2.add(Calendar.SECOND, 20);
-// int order2 = (int) (cal2.getTimeInMillis() / 1000);
-//
-// Calendar cal3 = Calendar.getInstance();
-// cal3.add(Calendar.SECOND, 30);
-// int order3 = (int) (cal3.getTimeInMillis() / 1000);
-//
-// jedis.zadd(DELAY_QUEUE, order1, "order1");
-// jedis.zadd(DELAY_QUEUE, order2, "order2");
-// jedis.zadd(DELAY_QUEUE, order3, "order3");
-// System.out.println(sdf.format(new Date()) + " add finished.");
-// }
-//
-// /**
-// * 消费消息
-// */
-// public void pollOrderQueue() {
-//
-// Jedis jedis = jedisPool.getResource();
-// while (true) {
-//
-// Set set = jedis.zrangeWithScores(DELAY_QUEUE, 0, 0);
-//
-// String value = ((Tuple) set.toArray()[0]).getElement();
-// int score = (int) ((Tuple) set.toArray()[0]).getScore();
-//
-// Calendar cal = Calendar.getInstance();
-// int nowSecond = (int) (cal.getTimeInMillis() / 1000);
-//
-// if (nowSecond >= score) {
-// jedis.zrem(DELAY_QUEUE, value);
-// System.out.println(sdf.format(new Date()) + " removed key:" + value);
-// }
-//
-// if (jedis.zcard(DELAY_QUEUE) <= 0) {
-// System.out.println(sdf.format(new Date()) + " zset empty ");
-// return;
-// }
-// try {
-// Thread.sleep(1000);
-// } catch (InterruptedException e) {
-// e.printStackTrace();
-// }
-// }
-// }
-//
-//}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/redis/rediscallback/RedisKeyExpirationListener.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/redis/rediscallback/RedisKeyExpirationListener.java"
deleted file mode 100644
index 3d53d5c6..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/redis/rediscallback/RedisKeyExpirationListener.java"
+++ /dev/null
@@ -1,25 +0,0 @@
-//package com.chengxy.delayqueue.redis.rediscallback;
-//
-//import org.springframework.data.redis.connection.Message;
-//import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
-//import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-//import org.springframework.stereotype.Component;
-//
-///**
-// * @Author: 公众号：程序员小富
-// * @Description:
-// */
-//@Component
-//public class RedisKeyExpirationListener extends KeyExpirationEventMessageListener {
-//
-// public RedisKeyExpirationListener(RedisMessageListenerContainer listenerContainer) {
-// super(listenerContainer);
-// }
-//
-// @Override
-// public void onMessage(Message message, byte[] pattern) {
-// String expiredKey = message.toString();
-// System.out.println("监听到key：" + expiredKey + "已过期");
-//
-// }
-//}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/redis/rediscallback/RedisListenerConfig.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/redis/rediscallback/RedisListenerConfig.java"
deleted file mode 100644
index 20169ddb..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/java/com/springboot101/redis/rediscallback/RedisListenerConfig.java"
+++ /dev/null
@@ -1,21 +0,0 @@
-//package com.chengxy.delayqueue.redis.rediscallback;
-//
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.data.redis.connection.RedisConnectionFactory;
-//import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-//
-///**
-// * @Author: 公众号：程序员小富
-// * @Description:
-// */
-//@Configuration
-//public class RedisListenerConfig {
-// @Bean
-// RedisMessageListenerContainer container(RedisConnectionFactory connectionFactory) {
-//
-// RedisMessageListenerContainer container = new RedisMessageListenerContainer();
-// container.setConnectionFactory(connectionFactory);
-// return container;
-// }
-//}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/resources/application.yml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/resources/application.yml"
deleted file mode 100644
index bb647677..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-delayqueue/src/main/resources/application.yml"
+++ /dev/null
@@ -1,8 +0,0 @@
-server:
- port: 6671
-
-spring:
- rabbitmq:
- addresses: 127.0.0.1:5672
- password: guest
- username: guest
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.gitignore" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.gitignore"
deleted file mode 100644
index b0c0ffdf..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.gitignore"
+++ /dev/null
@@ -1,36 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-!/.idea/
-!/.idea/
-!/.idea/
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/.gitignore" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/.gitignore"
deleted file mode 100644
index 26d33521..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/.gitignore"
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/compiler.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/compiler.xml"
deleted file mode 100644
index 2f55cb63..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/compiler.xml"
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/encodings.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/encodings.xml"
deleted file mode 100644
index aa00ffab..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/encodings.xml"
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/jarRepositories.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/jarRepositories.xml"
deleted file mode 100644
index f0b4cc9c..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/jarRepositories.xml"
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/misc.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/misc.xml"
deleted file mode 100644
index d5cd6143..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/misc.xml"
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/uiDesigner.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/uiDesigner.xml"
deleted file mode 100644
index 2b63946d..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/.idea/uiDesigner.xml"
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/README.md" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/README.md"
deleted file mode 100644
index b66375ca..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/README.md"
+++ /dev/null
@@ -1,4 +0,0 @@
-### 本案例对应的文章教程
-
-[6 种方式读取 Springboot 的配置，老鸟都这么玩（原理+实战）](http://mp.weixin.qq.com/s?__biz=MzAxNTM4NzAyNg==&mid=2247504127&idx=1&sn=7416045cdfb893b7f284a160ff168da2&chksm=9b864002acf1c914a055c72a0b943867fc98639fb15917839aaf8d2135a64e65bd030ce7e896&token=755618913&lang=zh_CN#rd)
-
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/pom.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/pom.xml"
deleted file mode 100644
index 3300b4f2..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/pom.xml"
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
- springboot-env-variables
- 0.0.1-SNAPSHOT
- springboot-env-variables
-
-
-
- org.springframework.boot
- spring-boot-starter
- 2.7.6
-
-
-
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/java/com/springboot101/Application.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/java/com/springboot101/Application.java"
deleted file mode 100644
index 0001cddc..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/java/com/springboot101/Application.java"
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.core.env.CompositePropertySource;
-import org.springframework.core.env.PropertySource;
-
-@SpringBootApplication
-public class Application {
-
- public static void main(String[] args) {
- SpringApplication.run(Application.class, args);
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/application.yml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/application.yml"
deleted file mode 100644
index 89d5604a..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/application.yml"
+++ /dev/null
@@ -1,11 +0,0 @@
-server:
- port: 6667
-
-env101:
- var1: var1-公众号：程序员小富
- var2: var2-公众号：程序员小富
- var3: var3-公众号：程序员小富
- var4: var4-公众号：程序员小富
- var5: var5-公众号：程序员小富
- var6: var6-公众号：程序员小富
- var7: var7-公众号：程序员小富
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/test.yml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/test.yml"
deleted file mode 100644
index c4c3f1a7..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/test.yml"
+++ /dev/null
@@ -1,11 +0,0 @@
-
-test:
- var1: var1-公众号：程序员小富1
- var2: var2-公众号：程序员小富2
- var3: var3-公众号：程序员小富3
- var4: var4-公众号：程序员小富4
- var5: var5-公众号：程序员小富5
- var6: var6-公众号：程序员小富6
- var7: var7-公众号：程序员小富7
- var8: var8-公众号：程序员小富8
- var9: var9-公众号：程序员小富9
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/xiaofu.properties" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/xiaofu.properties"
deleted file mode 100644
index 88a30507..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/xiaofu.properties"
+++ /dev/null
@@ -1,2 +0,0 @@
-env101.var9=var9-程序员小富
-env101.var10=var10-程序员小富
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/xiaofu.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/xiaofu.xml"
deleted file mode 100644
index f2d93a33..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/xiaofu.xml"
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- var9-公众号：程序员小富
- var10-公众号：程序员小富
-
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/xiaofu.yaml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/xiaofu.yaml"
deleted file mode 100644
index 9905ff3e..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/xiaofu.yaml"
+++ /dev/null
@@ -1,2 +0,0 @@
-env101:
- var11: var11-公众号：程序员小富
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/xiaofu.yml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/xiaofu.yml"
deleted file mode 100644
index 97d66f70..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/main/resources/xiaofu.yml"
+++ /dev/null
@@ -1,3 +0,0 @@
-env101:
- var9: var9-公众号：程序员小富
- var10: var10-公众号：程序员小富
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/PropertySources/PropertySourcesConf.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/PropertySources/PropertySourcesConf.java"
deleted file mode 100644
index 37acbbc4..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/PropertySources/PropertySourcesConf.java"
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.springboot101.PropertySources;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-
-@Data
-@Configuration
-@PropertySources({
- @PropertySource(value = "classpath:xiaofu.properties",encoding = "utf-8")
-})
-public class PropertySourcesConf {
-
- @Value("${env101.var10}")
- private String var10;
-
- @Value("${env101.var9}")
- private String var9;
-
-
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/PropertySources/PropertySourcesConf2.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/PropertySources/PropertySourcesConf2.java"
deleted file mode 100644
index fdc40e78..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/PropertySources/PropertySourcesConf2.java"
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.springboot101.PropertySources;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.context.annotation.PropertySources;
-
-@Data
-@Configuration
-@PropertySources({
- @PropertySource(value = "classpath:xiaofu.yaml", encoding = "utf-8", factory = YamlPropertySourceFactory.class)
-})
-public class PropertySourcesConf2 {
-
- @Value("${env101.var10}")
- private String var10;
-
- @Value("${env101.var9}")
- private String var9;
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/PropertySources/PropertySourcesTest.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/PropertySources/PropertySourcesTest.java"
deleted file mode 100644
index 7c1363a6..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/PropertySources/PropertySourcesTest.java"
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.springboot101.PropertySources;
-
-import com.alibaba.fastjson.JSON;
-import com.springboot101.configurationProperties.MyConf;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.core.env.Environment;
-import org.springframework.core.env.PropertyResolver;
-
-import javax.annotation.Resource;
-
-@Slf4j
-@SpringBootTest
-public class PropertySourcesTest {
-
- @Resource
- private PropertySourcesConf propertySourcesConf;
-
- @Resource
- private PropertySourcesConf2 propertySourcesConf2;
-
- @Resource
- private Environment environment;
-
- @Test
- public void myConfTest() {
- log.info("@PropertySources注解 @Value 获取 {}", propertySourcesConf.getVar9());
- log.info("@PropertySources注解 environment 获取 {}", propertySourcesConf.getVar10());
- }
-
-
- @Test
- public void myConfTest2() {
- log.info("@PropertySources注解 @Value 获取 {}", propertySourcesConf2.getVar9());
- log.info("@PropertySources注解 environment 获取 {}", propertySourcesConf2.getVar10());
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/PropertySources/YamlPropertySourceFactory.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/PropertySources/YamlPropertySourceFactory.java"
deleted file mode 100644
index cf8035ff..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/PropertySources/YamlPropertySourceFactory.java"
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.springboot101.PropertySources;
-
-import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
-import org.springframework.core.env.PropertiesPropertySource;
-import org.springframework.core.env.PropertySource;
-import org.springframework.core.io.support.EncodedResource;
-import org.springframework.core.io.support.PropertySourceFactory;
-
-import java.io.IOException;
-import java.util.Properties;
-
-public class YamlPropertySourceFactory implements PropertySourceFactory {
-
- @Override
- public PropertySource createPropertySource(String name, EncodedResource encodedResource) throws IOException {
- YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
- factory.setResources(encodedResource.getResource());
-
- Properties properties = factory.getObject();
-
- return new PropertiesPropertySource(encodedResource.getResource().getFilename(), properties);
- }
-}
-
-
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/configurationProperties/ConfTest.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/configurationProperties/ConfTest.java"
deleted file mode 100644
index e93ff25e..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/configurationProperties/ConfTest.java"
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.springboot101.configurationProperties;
-
-import com.alibaba.fastjson.JSON;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.PropertySources;
-
-import javax.annotation.Resource;
-
-@Slf4j
-@SpringBootTest
-public class ConfTest {
-
- @Resource
- private MyConf myConf;
-
- @Test
- public void myConfTest() {
- log.info("@ConfigurationProperties注解 配置获取 {}", JSON.toJSONString(myConf));
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/configurationProperties/MyConf.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/configurationProperties/MyConf.java"
deleted file mode 100644
index 5fc786fc..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/configurationProperties/MyConf.java"
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.springboot101.configurationProperties;
-
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Data
-@Configuration
-@ConfigurationProperties(prefix = "env101")
-public class MyConf {
-
- private String var1;
-
- private String var2;
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/custom/CustomTest.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/custom/CustomTest.java"
deleted file mode 100644
index 9436c1af..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/custom/CustomTest.java"
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.springboot101.custom;
-
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.core.env.PropertyResolver;
-import org.springframework.core.env.PropertySource;
-import org.springframework.core.env.PropertySources;
-
-import javax.annotation.Resource;
-import java.util.Arrays;
-
-@Slf4j
-@SpringBootTest
-public class CustomTest {
-
- @Autowired
- private PropertySources propertySources;
-
- @Test
- public void customTest() {
- for (PropertySource propertySource : propertySources) {
- log.info("自定义获取 配置获取 name {} ,{}", propertySource.getName(), propertySource.getSource());
- }
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/environment/EnvironmentTest.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/environment/EnvironmentTest.java"
deleted file mode 100644
index 9f79c8ab..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/environment/EnvironmentTest.java"
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.springboot101.environment;
-
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.boot.context.properties.ConfigurationPropertiesBindingPostProcessor;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.core.env.Environment;
-import org.springframework.core.env.PropertyResolver;
-import org.springframework.web.context.support.ServletContextPropertySource;
-
-import javax.annotation.Resource;
-
-@Slf4j
-@SpringBootTest
-public class EnvironmentTest {
-
- @Resource
- private PropertyResolver env;
-
- @Test
- public void var1Test() {
- String var1 = env.getProperty("env101.var1");
- log.info("Environment 配置获取 {}", var1);
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/value\346\263\250\350\247\243/EnvVariables2Test.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/value\346\263\250\350\247\243/EnvVariables2Test.java"
deleted file mode 100644
index 3fe5e393..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/value\346\263\250\350\247\243/EnvVariables2Test.java"
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.springboot101.value注解;
-
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import javax.annotation.Resource;
-
-@Slf4j
-@SpringBootTest
-public class EnvVariables2Test {
-
- private final String var6;
-
- @Autowired
- EnvVariables2Test( @Value("${env101.var6}") String var6) {
-
- this.var6 = var6;
- }
-
-
- /**
- * @value注解 final 获取
- */
- @Test
- public void var6Test() {
- log.info("final 注入: {}", var6);
- }
-
- /**
- * @value注解 非注册的类中使用
- * `@Component`、`@Service`、`@Controller`、`@Repository` 或 `@Configuration` 等**容器管理**注解的类中使用 @Value注解才会生效
- */
- @Test
- public void var7Test() {
-
-// log.info("非注册的类中使用 注入: {}", testService.getVar7());
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/value\346\263\250\350\247\243/EnvVariablesTest.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/value\346\263\250\350\247\243/EnvVariablesTest.java"
deleted file mode 100644
index b71209fe..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/value\346\263\250\350\247\243/EnvVariablesTest.java"
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.springboot101.value注解;
-
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@Slf4j
-@SpringBootTest
-public class EnvVariablesTest {
-
- @Value("${env101.var1}")
- private String var1;
-
- private static String var3;
-
- private static String var4;
-
-
- @Value("${env101.var3}")
- public void setVar3(String var3) {
- EnvVariablesTest.var3 = var3;
- }
-
- private final String var6;
-
- @Autowired
- EnvVariablesTest(@Value("${env101.var4}") String var4,@Qualifier("var6") String var6) {
- EnvVariablesTest.var4 = var4;
-
- this.var6 = var6;
- }
-
- public static String getVar4() {
- return var4;
- }
-
- public static String getVar3() {
- return var3;
- }
-
- /**
- * @value注解 普通获取
- */
- @Test
- public void var1Test() {
- log.info("配置文件属性: {}", var1);
- }
-
- /**
- * @value注解 静态变量获取
- */
- @Test
- public void var2Test() {
- log.info("普通方法注入：{}", var3);
- log.info("构造函数注入：{}", var4);
- }
-
- /**
- *
- */
- @Test
- public void var3Test() {
- log.info("静态变量注入：{}", var3);
- log.info("静态变量注入：{}", var4);
- log.info("final 注入：{}", var6);
- }
-
- /**
- *
- */
- @Test
- public void var4Test() {
- log.info(var1);
- }
-
-
- /**
- *
- */
- @Test
- public void var5Test() {
- log.info(var1);
- }
-
- /**
- * 第六种方式
- */
- @Test
- public void var6Test() {
- log.info(var1);
- }
-
- /**
- * 第七种方式
- */
- @Test
- public void var7Test() {
- log.info(var1);
- }
-
- /**
- * 第八种方式
- */
- @Test
- public void var8Test() {
- log.info(var1);
- }
-
- /**
- * 第九种方式
- */
- @Test
- public void var9Test() {
- log.info(var1);
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/yaml/MyYamlConfig.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/yaml/MyYamlConfig.java"
deleted file mode 100644
index 30322f35..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/yaml/MyYamlConfig.java"
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.springboot101.yaml;
-
-import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.core.io.ClassPathResource;
-
-import java.util.Objects;
-
-@Configuration
-public class MyYamlConfig {
-
- @Bean
- public static PropertySourcesPlaceholderConfigurer yamlConfigurer() {
- PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer();
- YamlPropertiesFactoryBean yaml = new YamlPropertiesFactoryBean();
- yaml.setResources(new ClassPathResource("xiaofu.yml"));
- configurer.setProperties(Objects.requireNonNull(yaml.getObject()));
- return configurer;
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/yaml/YamlTest.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/yaml/YamlTest.java"
deleted file mode 100644
index 6ed3a776..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-env-variables/src/test/java/com/springboot101/yaml/YamlTest.java"
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.springboot101.yaml;
-
-import com.alibaba.fastjson.JSON;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.core.env.PropertyResolver;
-
-import javax.annotation.Resource;
-
-@Slf4j
-@SpringBootTest
-public class YamlTest {
-
- @Value("${env101.var11}")
- private String var11;
-
- @Test
- public void myYamlTest() {
- log.info("Yaml 配置获取 {}", var11);
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/README.md" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/README.md"
deleted file mode 100644
index 20afdd0b..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/README.md"
+++ /dev/null
@@ -1 +0,0 @@
-shi
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/pom.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/pom.xml"
deleted file mode 100644
index fa7ef836..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/pom.xml"
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
- springboot-global-formatting
- 0.0.1-SNAPSHOT
- springboot-global-formatting
-
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
-
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/resources/application.yml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/resources/application.yml"
deleted file mode 100644
index f45bfbe2..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-global-formatting/src/main/resources/application.yml"
+++ /dev/null
@@ -1,3 +0,0 @@
-server:
- port: 6672
-
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/README.md" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/README.md"
deleted file mode 100644
index 46f2dfa4..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/README.md"
+++ /dev/null
@@ -1,3 +0,0 @@
-### 本案例对应的文章教程
-
-[Springboot 配置文件、隐私数据脱敏的最佳实践（原理+源码）](http://mp.weixin.qq.com/s?__biz=MzAxNTM4NzAyNg==&mid=2247496247&idx=1&sn=643af4cbe578a1c52bc302af948803ef&chksm=9b8662caacf1ebdc628c48890a6f7274acfaae9fa4a3ec519d41c4dec92182802e46c621658b&token=755618913&lang=zh_CN#rd)
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/pom.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/pom.xml"
deleted file mode 100644
index b80c71a5..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/pom.xml"
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
-
- springboot-jasypt
-
-
- 8
- 8
-
-
-
-
-
- com.github.ulisesbocchio
- jasypt-spring-boot-starter
- 2.1.0
-
-
- org.aspectj
- aspectjweaver
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/JasyptApplication.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/JasyptApplication.java"
deleted file mode 100644
index e87e5727..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/JasyptApplication.java"
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
-
-@ComponentScan("com.springboot101")
-@SpringBootApplication
-public class JasyptApplication {
-
- public static void main(String[] args) {
- ConfigurableApplicationContext run = SpringApplication.run(JasyptApplication.class, args);
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/annotation/EncryptField.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/annotation/EncryptField.java"
deleted file mode 100644
index cc1e9081..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/annotation/EncryptField.java"
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.springboot101.annotation;
-
-import java.lang.annotation.*;
-@Documented
-@Target({ElementType.FIELD,ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EncryptField {
-
- String[] value() default "";
-}
-
-
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/annotation/EncryptMethod.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/annotation/EncryptMethod.java"
deleted file mode 100644
index f5afdc8c..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/annotation/EncryptMethod.java"
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.springboot101.annotation;
-
-import java.lang.annotation.*;
-
-import static com.springboot101.enums.EncryptConstant.ENCRYPT;
-
-@Documented
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EncryptMethod {
-
- String type() default ENCRYPT;
-}
-
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/aspect/EncryptHandler.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/aspect/EncryptHandler.java"
deleted file mode 100644
index dae3af51..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/aspect/EncryptHandler.java"
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.springboot101.aspect;
-
-import com.springboot101.annotation.EncryptField;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.*;
-import org.jasypt.encryption.StringEncryptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Field;
-import java.util.*;
-
-import static com.springboot101.enums.EncryptConstant.DECRYPT;
-import static com.springboot101.enums.EncryptConstant.ENCRYPT;
-
-@Slf4j
-@Aspect
-@Component
-public class EncryptHandler {
-
- @Autowired
- private StringEncryptor stringEncryptor;
-
- @Pointcut("@annotation(com.springboot101.annotation.EncryptMethod)")
- public void pointCut() {
- }
-
- @Around("pointCut()")
- public Object around(ProceedingJoinPoint joinPoint) {
- /**
- * 加密
- */
- encrypt(joinPoint);
- /**
- * 解密
- */
- Object decrypt = decrypt(joinPoint);
- return decrypt;
- }
-
- public void encrypt(ProceedingJoinPoint joinPoint) {
-
- try {
- Object[] objects = joinPoint.getArgs();
- if (objects.length != 0) {
- for (Object o : objects) {
- if (o instanceof String) {
- encryptValue(o);
- } else {
- handler(o, ENCRYPT);
- }
- //TODO 其余类型自己看实际情况加
- }
- }
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- }
- }
-
- public Object decrypt(ProceedingJoinPoint joinPoint) {
- Object result = null;
- try {
- Object obj = joinPoint.proceed();
- if (obj != null) {
- if (obj instanceof String) {
- decryptValue(obj);
- } else {
- result = handler(obj, DECRYPT);
- }
- //TODO 其余类型自己看实际情况加
- }
- } catch (Throwable e) {
- e.printStackTrace();
- }
- return result;
- }
-
- private Object handler(Object obj, String type) throws IllegalAccessException {
-
- if (Objects.isNull(obj)) {
- return null;
- }
- Field[] fields = obj.getClass().getDeclaredFields();
- for (Field field : fields) {
- boolean hasSecureField = field.isAnnotationPresent(EncryptField.class);
- if (hasSecureField) {
- field.setAccessible(true);
- String realValue = (String) field.get(obj);
- String value;
- if (DECRYPT.equals(type)) {
- value = stringEncryptor.decrypt(realValue);
- } else {
- value = stringEncryptor.encrypt(realValue);
- }
- field.set(obj, value);
- }
- }
- return obj;
- }
-
- public String encryptValue(Object realValue) {
- String value = null;
- try {
- value = stringEncryptor.encrypt(String.valueOf(realValue));
- } catch (Exception ex) {
- return value;
- }
- return value;
- }
-
- public String decryptValue(Object realValue) {
- String value = String.valueOf(realValue);
- try {
- value = stringEncryptor.decrypt(value);
- } catch (Exception ex) {
- return value;
- }
- return value;
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/controller/Encryptor.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/controller/Encryptor.java"
deleted file mode 100644
index 2b013617..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/controller/Encryptor.java"
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.springboot101.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.springboot101.annotation.EncryptField;
-import com.springboot101.annotation.EncryptMethod;
-import com.springboot101.model.UserVo;
-import lombok.extern.slf4j.Slf4j;
-import org.jasypt.encryption.StringEncryptor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@Slf4j
-@RestController
-@RequestMapping("/encryptor/")
-public class Encryptor {
-
- @Autowired
- private StringEncryptor stringEncryptor;
-
- public void encrypt(String content) {
- String encryptStr = stringEncryptor.encrypt("公众号：程序员小富");
- System.out.println("加密后的内容：" + encryptStr);
- }
-
- @EncryptMethod
- @PostMapping(value = "test")
- @ResponseBody
- public Object testEncrypt(@RequestBody UserVo user, @EncryptField String name) {
-
- return insertUser(user, name);
- }
-
- private UserVo insertUser(UserVo user, String name) {
- System.out.println("加密后的数据：user" + JSON.toJSONString(user));
- return user;
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/enums/EncryptConstant.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/enums/EncryptConstant.java"
deleted file mode 100644
index eee3cf55..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/enums/EncryptConstant.java"
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.springboot101.enums;
-
-
-public interface EncryptConstant {
-
- // 加密
- String ENCRYPT = "encrypt";
-
- // 解密
- String DECRYPT = "decrypt";
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/model/UserVo.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/model/UserVo.java"
deleted file mode 100644
index 707ec213..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/java/com/springboot101/model/UserVo.java"
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.springboot101.model;
-
-import com.springboot101.annotation.EncryptField;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @Auther: 公众号：程序员小富
- * @Date: 2021/7/26 15:10
- * @Description:
- */
-@Data
-public class UserVo implements Serializable {
-
- private Long userId;
-
- @EncryptField
- private String mobile;
-
- @EncryptField
- private String address;
-
- private String age;
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/resources/application.yml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/resources/application.yml"
deleted file mode 100644
index 322bd95f..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-jasypt/src/main/resources/application.yml"
+++ /dev/null
@@ -1,13 +0,0 @@
-server:
- port: 9000
-
-spring:
- datasource:
- url: jdbc:mysql://1.2.3.4:3306/xiaofu?useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
- username: 公众号：程序员小富
- password: ENC(mVTvp4IddqdaYGqPl9lCQbzM3H/b0B6l)
-
-jasypt:
- encryptor:
- password: 35579B7F9C8CB15E
- poolSize: 3
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/README.md" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/README.md"
deleted file mode 100644
index af76a644..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/README.md"
+++ /dev/null
@@ -1,2 +0,0 @@
-
-实现三种异步流式接口
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/pom.xml" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/pom.xml"
deleted file mode 100644
index ed734a58..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/pom.xml"
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- 4.0.0
-
- com.notebook
- Springboot-Notebook
- 0.0.1-SNAPSHOT
-
- springboot-streaming
- 0.0.1-SNAPSHOT
- springboot-streaming
-
-
-
- org.springframework.boot
- spring-boot-starter-thymeleaf
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
-
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/StreamingApplication.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/StreamingApplication.java"
deleted file mode 100644
index 6f7a0c4f..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/StreamingApplication.java"
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class StreamingApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(StreamingApplication.class, args);
- }
-
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/controller/ResponseBodyEmitterController.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/controller/ResponseBodyEmitterController.java"
deleted file mode 100644
index 201906a5..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/controller/ResponseBodyEmitterController.java"
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.springboot101.controller;
-
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter;
-
-import java.util.Date;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-@Controller
-public class ResponseBodyEmitterController {
- private final ExecutorService nonBlockingService = Executors.newCachedThreadPool();
-
- @GetMapping("bodyEmitter")
- public ResponseBodyEmitter handle() {
-
- // 创建一个ResponseBodyEmitter，-1代表不超时
- ResponseBodyEmitter emitter = new ResponseBodyEmitter(-1L);
-
- // 异步执行耗时操作
- CompletableFuture.runAsync(() -> {
- try {
- // 模拟耗时操作
- for (int i = 0; i < 10000; i++) {
- System.out.println("bodyEmitter " + i);
- // 发送数据
- emitter.send("bodyEmitter " + i + " @ " + new Date() + "\n");
- Thread.sleep(2000);
- }
- // 完成
- emitter.complete();
- } catch (Exception e) {
- // 发生异常时结束接口
- emitter.completeWithError(e);
- }
- });
- return emitter;
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/controller/SseEmitterController.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/controller/SseEmitterController.java"
deleted file mode 100644
index 79d27fbc..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/controller/SseEmitterController.java"
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.springboot101.controller;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-import java.io.IOException;
-import java.time.LocalTime;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-
-@Slf4j
-@RestController
-public class SseEmitterController {
-
- private static final Map EMITTER_MAP = new ConcurrentHashMap<>();
-
- @GetMapping("/subSseEmitter/{userId}")
- public SseEmitter sseEmitter(@PathVariable String userId) {
- log.info("sseEmitter: {}", userId);
- SseEmitter emitterTmp = new SseEmitter(-1L);
- EMITTER_MAP.put(userId, emitterTmp);
- CompletableFuture.runAsync(() -> {
- try {
- SseEmitter.SseEventBuilder event = SseEmitter.event()
- .data("sseEmitter" + userId + " @ " + LocalTime.now())
- .id(String.valueOf(userId))
- .name("sseEmitter");
- emitterTmp.send(event);
- } catch (Exception ex) {
- emitterTmp.completeWithError(ex);
- }
- });
- return emitterTmp;
- }
-
- @GetMapping("/sendSseMsg/{userId}")
- public void sseEmitter(@PathVariable String userId, String msg) throws IOException {
- SseEmitter sseEmitter = EMITTER_MAP.get(userId);
- if (sseEmitter == null) {
- return;
- }
- sseEmitter.send(msg);
- }
-// @GetMapping("/sseEmitter/{userId}")
-// public SseEmitter sseEmitter(@PathVariable String userId) {
-//
-// CompletableFuture.runAsync(() -> {
-// try {
-// for (int i = 0; i < 10000; i++) {
-// SseEmitter.SseEventBuilder event = SseEmitter.event()
-// .data("sseEmitter" + i + " @ " + LocalTime.now())
-// .id(String.valueOf(i))
-// .name("sseEmitter");
-// emitter.send(event);
-// Thread.sleep(1000);
-// }
-// emitter.complete();
-// } catch (Exception ex) {
-// emitter.completeWithError(ex);
-// }
-// });
-// return emitter;
-// }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/controller/StreamingResponseBodyController.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/controller/StreamingResponseBodyController.java"
deleted file mode 100644
index ad8f29db..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/controller/StreamingResponseBodyController.java"
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.springboot101.controller;
-
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
-
-import java.util.concurrent.TimeUnit;
-
-@Controller
-public class StreamingResponseBodyController {
-
- @GetMapping("/streamingResponse")
- public ResponseEntity handleRbe() {
-
- StreamingResponseBody stream = out -> {
- String message = "streamingResponse";
- for (int i = 0; i < 1000; i++) {
- try {
- out.write(((message + i) + "\r\n").getBytes());
- out.write("\r\n".getBytes());
- //调用一次flush就会像前端写入一次数据
- out.flush();
- TimeUnit.SECONDS.sleep(1);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- };
- return ResponseEntity.ok().contentType(MediaType.TEXT_HTML).body(stream);
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/controller/TestController.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/controller/TestController.java"
deleted file mode 100644
index f1763704..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/java/com/springboot101/controller/TestController.java"
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.springboot101.controller;
-
-
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class TestController {
-
- @GetMapping("/sse")
- public String sse(Model model) {
- return "sse";
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/resources/templates/sse.html" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/resources/templates/sse.html"
deleted file mode 100644
index 51652d60..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-streaming/src/main/resources/templates/sse.html"
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
- SSE
-
-
-
-
SSE 接收服务端事件消息数据
-
等待连接...
-
- 4.0.0
-
- com.springboot101
- springboot101
- 0.0.1-SNAPSHOT
-
-
- springboot-valid-params
-
-
-
- org.springframework.boot
- spring-boot-starter-validation
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/ValidApplication.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/ValidApplication.java"
deleted file mode 100644
index fd75b80b..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/ValidApplication.java"
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.springboot101;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class ValidApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(ValidApplication.class, args);
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/controller/TestController.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/controller/TestController.java"
deleted file mode 100644
index 9aebd420..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/controller/TestController.java"
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.springboot101.controller;
-
-import com.springboot101.params.UserVO;
-import com.springboot101.params.ValidGroup;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class TestController {
-
- @PostMapping("/addUserInfo")
- public String addUserInfo(@Validated @RequestBody UserVO user) {
- return "插入成功!";
- }
-
- @PostMapping("/editUserInfo")
- public String editUserInfo(@Validated({ValidGroup.Update.class}) @RequestBody UserVO user) {
- return "编辑成功!";
- }
-}
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/domain/ResponseResult.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/domain/ResponseResult.java"
deleted file mode 100644
index ef6a5ece..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/domain/ResponseResult.java"
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.springboot101.domain;
-
-import com.springboot101.enums.ResultCode;
-import lombok.Data;
-
-
-@Data
-public class ResponseResult {
-
- private int code;
- private String message;
- private T data;
- private long timestamp ;
-
-
- public ResponseResult(){
- this.timestamp = System.currentTimeMillis();
- }
-
- public ResponseResult(int code) {
- this.code = code;
- }
-
- public ResponseResult(int code, String message) {
- this.code = code;
- this.message = message;
- }
-
- public ResponseResult(int code, String message, T data) {
- this.code = code;
- this.message = message;
- this.data = data;
- }
-
- public static ResponseResult success(T data) {
- ResponseResult resultData = new ResponseResult<>();
- resultData.setCode(ResultCode.OK.getCode());
- resultData.setMessage(ResultCode.OK.getMessage());
- resultData.setData(data);
- return resultData;
- }
-
- public static ResponseResult fail(int code, String message) {
- ResponseResult resultData = new ResponseResult<>();
- resultData.setCode(code);
- resultData.setMessage(message);
- return resultData;
- }
-
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/enums/ResultCode.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/enums/ResultCode.java"
deleted file mode 100644
index 92ef17c9..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/enums/ResultCode.java"
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.springboot101.enums;
-
-
-public enum ResultCode {
-
- /**
- * 操作成功
- */
- OK(100, "操作成功"),
-
- /**
- * 操作失败
- */
- OPS_ERROR(-1, "操作失败"),
-
- /**
- * 参数校验不通过
- */
- PARAMETER_ERROR(204, "参数校验不通过"),
-
- /**
- * 服务异常
- */
- SYSTEM_ERROR(500, "系统异常，请稍后重试");
-
- /**
- * 自定义状态码
- **/
- private final int code;
-
- /**
- * 自定义描述
- **/
- private final String message;
-
- ResultCode(int code, String message) {
- this.code = code;
- this.message = message;
- }
-
-
- public int getCode() {
- return code;
- }
-
- public String getMessage() {
- return message;
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/exception/GlobalExceptionHandler.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/exception/GlobalExceptionHandler.java"
deleted file mode 100644
index aaf23e2d..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/exception/GlobalExceptionHandler.java"
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.springboot101.exception;
-
-import com.springboot101.enums.ResultCode;
-import com.springboot101.domain.ResponseResult;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.converter.HttpMessageNotReadableException;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.FieldError;
-import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.MissingServletRequestParameterException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-import java.util.List;
-
-@Slf4j
-@RestControllerAdvice
-public class GlobalExceptionHandler {
-
- /**
- * 忽略参数异常处理器
- *
- * @param e 忽略参数异常
- * @return ResponseResult
- */
- @ResponseStatus(HttpStatus.BAD_REQUEST)
- @ExceptionHandler(MissingServletRequestParameterException.class)
- public ResponseResult parameterMissingExceptionHandler(MissingServletRequestParameterException e) {
- log.error("", e);
- return new ResponseResult(ResultCode.PARAMETER_ERROR.getCode(), "请求参数 " + e.getParameterName() + " 不能为空");
- }
-
- /**
- * 缺少请求体异常处理器
- *
- * @param e 缺少请求体异常
- * @return ResponseResult
- */
- @ResponseStatus(HttpStatus.BAD_REQUEST)
- @ExceptionHandler(HttpMessageNotReadableException.class)
- public ResponseResult parameterBodyMissingExceptionHandler(HttpMessageNotReadableException e) {
- log.error("", e);
- return new ResponseResult(ResultCode.PARAMETER_ERROR.getCode(), "参数体不能为空");
- }
-
- /**
- * 参数效验异常处理器
- *
- * @param e 参数验证异常
- * @return ResponseInfo
- */
- @ResponseStatus(HttpStatus.BAD_REQUEST)
- @ExceptionHandler(MethodArgumentNotValidException.class)
- public ResponseResult parameterExceptionHandler(MethodArgumentNotValidException e) {
- log.error("", e);
- // 获取异常信息
- BindingResult exceptions = e.getBindingResult();
- // 判断异常中是否有错误信息，如果存在就使用异常中的消息，否则使用默认消息
- if (exceptions.hasErrors()) {
- List errors = exceptions.getAllErrors();
- if (!errors.isEmpty()) {
- // 这里列出了全部错误参数，按正常逻辑，只需要第一条错误即可
- FieldError fieldError = (FieldError) errors.get(0);
- return new ResponseResult(ResultCode.PARAMETER_ERROR.getCode(), fieldError.getDefaultMessage());
- }
- }
- return new ResponseResult(ResultCode.PARAMETER_ERROR.getCode());
- }
-
- /**
- * 自定义参数错误异常处理器
- *
- * @param e 自定义参数
- * @return ResponseInfo
- */
- @ResponseStatus(HttpStatus.BAD_REQUEST)
- @ExceptionHandler({ParamsErrorException.class})
- public ResponseResult paramExceptionHandler(ParamsErrorException e) {
- log.error("", e);
- // 判断异常中是否有错误信息，如果存在就使用异常中的消息，否则使用默认消息
- if (!StringUtils.isEmpty(e.getMessage())) {
- return new ResponseResult(ResultCode.PARAMETER_ERROR.getCode(), e.getMessage());
- }
- return new ResponseResult(ResultCode.PARAMETER_ERROR.getCode());
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/exception/ParamsErrorException.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/exception/ParamsErrorException.java"
deleted file mode 100644
index 6bf5a0db..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/exception/ParamsErrorException.java"
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.springboot101.exception;
-
-
-public class ParamsErrorException extends RuntimeException {
-
- private final int code;
-
- public ParamsErrorException(int code, String message) {
- super(message);
- this.code = code;
- }
-
- public int getCode() {
- return code;
- }
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/params/UserVO.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/params/UserVO.java"
deleted file mode 100644
index 710f559f..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/params/UserVO.java"
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.springboot101.params;
-
-
-import lombok.Data;
-import org.springframework.web.bind.annotation.GetMapping;
-
-import javax.validation.constraints.*;
-import java.util.Date;
-
-/**
- * gon
- */
-@Data
-public class UserVO {
-
- @NotBlank(message = "姓名不为空", groups = ValidGroup.Insert.class)
- private String username;
-
- @NotBlank(message = "密码不为空", groups = ValidGroup.Update.class)
- private String password;
-
- @Min(value = 18, message = "年龄不小于18", groups = {ValidGroup.Update.class, ValidGroup.Insert.class})
- @Max(value = 100, message = "年龄不大于100", groups = {ValidGroup.Update.class, ValidGroup.Insert.class})
- @NotNull(message = "age不为空", groups = {ValidGroup.Update.class, ValidGroup.Insert.class})
- private int age;
-
- @Email(message = "邮件格式不对")
- @NotBlank(message = "邮件不为空", groups = ValidGroup.Insert.class)
- private String email;
-
- // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-// @Future(message = "必须是将来时间")
- @NotNull(message = "createTime不为空", groups = {ValidGroup.Update.class, ValidGroup.Insert.class})
- private Date createTime;
-
- @GetMapping("/hello")
- public String getStr() {
- return "hello,javadaily";
- }
-
-}
\ No newline at end of file
diff --git "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/params/ValidGroup.java" "b/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/params/ValidGroup.java"
deleted file mode 100644
index 469c0b52..00000000
--- "a/springboot101/\351\200\232\347\224\250\345\212\237\350\203\275/springboot-valid-params/src/main/java/com/springboot101/params/ValidGroup.java"
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.springboot101.params;
-
-import javax.validation.GroupSequence;
-
-/**
- * 分组校验 - 定义分组
- */
-
-/**
- * 分组校验 - 定义分组
- * @author 公众号：程序员小富
- * @date 2023/10/24 11:02
- */
-public class ValidGroup {
-
- // 新增使用
- public interface Insert {
- }
-
- // 更新使用
- public interface Update {
- }
-
- // 删除使用
- public interface Delete {
- }
-
- // 属性必须有这两个分组的才验证(配合spring的@Validated功能分组使用)
- @GroupSequence({Insert.class, Update.class, Delete.class})
- public interface All {
- }
-}
\ No newline at end of file
diff --git a/wx/book.png b/wx/book.png
deleted file mode 100644
index 9ba05e6d..00000000
Binary files a/wx/book.png and /dev/null differ
diff --git a/wx/gonghao.jpg b/wx/gonghao.jpg
deleted file mode 100644
index 0e9b959e..00000000
Binary files a/wx/gonghao.jpg and /dev/null differ
diff --git a/wx/person.png b/wx/person.png
deleted file mode 100644
index a1ab539f..00000000
Binary files a/wx/person.png and /dev/null differ
diff --git a/wx/wx.jpg b/wx/wx.jpg
deleted file mode 100644
index 1c67d073..00000000
Binary files a/wx/wx.jpg and /dev/null differ
- 
- 
- 
-
-
-
-[**作者小富，目前就职某大厂，点击一起来了解下**](https://mp.weixin.qq.com/s?__biz=MzAxNTM4NzAyNg==&mid=2247500646&idx=1&sn=5a0993997dc1fc609da4eda5ba610681&chksm=9b86539bacf1da8d2bc22b569d27e1b7b85a21a0ec7d5a5f4a6660148a5f40f076e2d42e4885&token=1045698719&lang=zh_CN#rd)
+| 案例 | 文章 |
+|--|--|
+| springboot-douyin-watermark | [手写一个抖音视频去水印工具，千万别刚一个程序员](https://mp.weixin.qq.com/s/Cq6_oQdHqr5_zsBc68Xn5Q)|
+| springboot-mqtt-messagepush | [未读消息（小红点），前端 与 RabbitMQ 实时消息推送实践，贼简单~](https://mp.weixin.qq.com/s/U-fUGr9i1MVa4PoVyiDFCg)|
+| springboot-global-formatting | [3种 Springboot 全局时间格式化方式，别再写重复代码了](https://mp.weixin.qq.com/s/MeDfnL__jdEq7Yi48vg_vA)|
+| springboot-work-flowable | [真是没想到，Springboot + Flowable 开发工作流会这么简单！](https://mp.weixin.qq.com/s/hXS9HirRnhYRMIwd4GVeIQ)|
+| springboot-testng-report | [3 分钟生成一个单元测试报告，这个样式爱了](https://mp.weixin.qq.com/s/5IW76pMMxRtVF-ewmp1PGw)|
+| springboot-database-doc | [实用！一键生成数据库文档，堪称数据库界的Swagger](https://mp.weixin.qq.com/s/nqxWD85XdhR1AHAa2ql65A)|
+| springboot-aop-unifiedlog | [又被逼着优化代码，这次我干掉了出入参 Log日志](https://mp.weixin.qq.com/s/hZ7KiFyeDMRCPUoNlCXO6w)|
+| springboot-rabbitmq-confirm | [springboot + rabbitmq 用了消息确认机制，感觉掉坑里了](https://mp.weixin.qq.com/s/me1bfFwzQDAn7EDOgoR65g)|
+| springboot-rabbitmq-mqtt | [我也没想到 springboot + rabbitmq 做智能家居，会这么简单](https://mp.weixin.qq.com/s/udFE6k9pPetIWsa6KeErrA)|
-## 项目介绍
-
-**Springboot-Notebook** 一个以 `springboot` 为基础开发框架，
-整合 `Redis` 、`Mysql` 、 `Rabbitmq` 、`ES` 、`MongoDB`、`sharding-jdbc
-分库分表`、`zookeeper` 、`web人脸识别` 、`实时消息推送` 、`SQL优化`、`注册中心` 、`数据脱敏` 等互联网主流技术，
-文章图解理论配合实战案例，实现开发中常见功能点的综合项目。
-本着拿来即用的原则，助力于减少开发者在工作中的学习成本。
-
-中间件 | 已整合的功能
--------- | -----
-分库分表 | sharding-jdbc
-缓存 | Redis
-数据库 | Mysql
-消息队列 | Rabbitmq 、kafka
-搜索引擎 | ES
-非关系数据库 | MongoDB
-注册中心 | zookeeper、nacos
-虹软SDK | web人脸识别
-消息推送 | 7种实时消息推送
-更多 | ......
-
-## 🤝 关于作者
-
-大家好，我是本站作者小富～ 从事编程工作十余年，在大厂狗东做过架构相关工作.
-
-写作分享很多年，将工作中的所遇到的问题、用到技术梳理成文章分享出来和小伙伴们共勉，希望对大家有用！
-
-目前在持续的更新三个系列的专题《Springboot开发实战100例》、《ShardingSphere5.x分库分表原理与实战》、《面试八股》
-
-## 🔥技术群 & 资料
-
-如果遇到了问题，可以通过以下方式联系我。也欢迎加入我们的技术交流群，群里都是热心的Javaer，会讨论技术问题，互相帮助，相信能让您获得更多收获。
-
-**在我的公众号：程序员小富，内提供了一些资料：**
-
-- 技术书籍公众号内回复[ **pdf** ] Get。
-
-- 面试笔记、springcloud进阶实战PDF，公众号内回复[ **1222** ] Get。
-
-- 原创《ShardingSphere5.x分库分表原理与实战》PDF，公众号内回复[ **分库分表** ] Get。
-
-
-|  |  |
-| ---------| ------- |
-| 
|
-| 关注公众号：程序员小富 | 接搜微信号：xiaofucode|
-
-
-## 系列专题
-
-### 《ShardingSphere5.x分库分表原理与实战》
-
-内容同步在小富的个人网站：[xiaofucode.com](https://xiaofucode.com)，现有章节已经生成了 **PDF**，欢迎下载！
-
-获取方式：《ShardingSphere5.x分库分表原理与实战》PDF，**公众号：程序员小富**内回复[ **分库分表** ] Get。
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
- 
-
- 
-