diff --git a/Mail/README.md b/Mail/README.md index daf4f6f9294253ce4c22ad1b3675040703f39e4d..e412c886663b4c5e3cf88bf49b4403e4d180caf8 100755 --- a/Mail/README.md +++ b/Mail/README.md @@ -1 +1,28 @@ -# 邮箱服务集成 +# 内容 + +邮箱服务集成。 + +其中配置文件为加密过的用户名以及密码（QQ邮箱叫授权码）。 + +- 如果不需要加密，去掉加密依赖，同时配置文件中直接写明文的用户名以及密码 +- 如果需要加密，请先配置加密口令 + +# 加密口令配置方式 + +支持方式如下： + +- 直接在配置文件中配置 +- 在运行配置中以环境变量的方式配置 + +![](./pic/1.png) + +![](./pic/2.png) + +# 环境 + +- spring-boot-starter-mail +- jasypt-spring-boot-starter + +# 博客 + +[地址](https://blog.csdn.net/qq_27525611/article/details/108668153) \ No newline at end of file diff --git a/Mail/demo/build.gradle.kts b/Mail/demo/build.gradle.kts index 5433b4144b3290449078c0de68e0c3dc1cc83133..6d33622b2d98e96fa36f408de5067749b5a262ce 100644 --- a/Mail/demo/build.gradle.kts +++ b/Mail/demo/build.gradle.kts @@ -1,15 +1,15 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("org.springframework.boot") version "2.4.3" + id("org.springframework.boot") version "2.6.7" id("io.spring.dependency-management") version "1.0.11.RELEASE" - kotlin("jvm") version "1.4.30" - kotlin("plugin.spring") version "1.4.30" + kotlin("jvm") version "1.6.21" + kotlin("plugin.spring") version "1.6.21" } group = "com.example" version = "0.0.1-SNAPSHOT" -java.sourceCompatibility = JavaVersion.VERSION_11 +java.sourceCompatibility = JavaVersion.VERSION_17 configurations { compileOnly { @@ -27,16 +27,16 @@ dependencies { implementation("com.fasterxml.jackson.module:jackson-module-kotlin") implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - implementation("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.3") developmentOnly("org.springframework.boot:spring-boot-devtools") annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") testImplementation("org.springframework.boot:spring-boot-starter-test") + implementation("com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.4") } tasks.withType { kotlinOptions { freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "11" + jvmTarget = "17" } } diff --git a/Mail/demo/gradle/wrapper/gradle-wrapper.jar b/Mail/demo/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 Binary files a/Mail/demo/gradle/wrapper/gradle-wrapper.jar and b/Mail/demo/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Mail/demo/gradle/wrapper/gradle-wrapper.properties b/Mail/demo/gradle/wrapper/gradle-wrapper.properties index 2a563242c11316831a57f9a5df4bfab13a1d21e3..00e33edef6936b1ada8721cff42201db8c9d8675 100644 --- a/Mail/demo/gradle/wrapper/gradle-wrapper.properties +++ b/Mail/demo/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Mail/demo/gradlew b/Mail/demo/gradlew index 4f906e0c811fc9e230eb44819f509cd0627f2600..1b6c787337ffb79f0e3cf8b1e9f00f680a959de1 100755 --- a/Mail/demo/gradlew +++ b/Mail/demo/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/Mail/demo/src/main/kotlin/com/example/demo/MailService.kt b/Mail/demo/src/main/kotlin/com/example/demo/MailService.kt old mode 100755 new mode 100644 diff --git a/Mail/demo/src/main/kotlin/com/example/demo/MailServiceImpl.kt b/Mail/demo/src/main/kotlin/com/example/demo/TestMailSender.kt old mode 100755 new mode 100644 similarity index 53% rename from Mail/demo/src/main/kotlin/com/example/demo/MailServiceImpl.kt rename to Mail/demo/src/main/kotlin/com/example/demo/TestMailSender.kt index 9f4c461df5418ece7a8dd2cc532f0c7dbbb6a026..cd6a33910a40088ebb8bb18d8ac48fe714f41d92 --- a/Mail/demo/src/main/kotlin/com/example/demo/MailServiceImpl.kt +++ b/Mail/demo/src/main/kotlin/com/example/demo/TestMailSender.kt @@ -8,10 +8,9 @@ import org.springframework.mail.javamail.JavaMailSender import org.springframework.mail.javamail.MimeMessageHelper import org.springframework.stereotype.Service import java.nio.file.Path -import javax.mail.internet.MimeMessage @Service -class MailServiceImpl : MailService { +class TestMailSender : MailService { @Autowired lateinit var sender: JavaMailSender @@ -25,23 +24,22 @@ class MailServiceImpl : MailService { } - override fun sendSimpleMail(to: String, subject: String, content: String) { - val message = SimpleMailMessage() - message.setFrom(from) - message.setTo(to) - message.setSubject(subject) - message.setText(content) - sender.send(message) - } + override fun sendSimpleMail(to: String, subject: String, content: String) = + sender.send(SimpleMailMessage().apply { + setFrom(TestMailSender.from) + setTo(to) + setSubject(subject) + setText(content) + }) - override fun sendAttachmentMail(to: String, subject: String, content: String, file: Path) { - val message: MimeMessage = sender.createMimeMessage() - val helper = MimeMessageHelper(message, true) - helper.setFrom(from) - helper.setTo(to) - helper.setSubject(subject) - helper.setText(content) - helper.addAttachment(file.fileName.toString(), FileSystemResource(file)) - sender.send(message) - } + override fun sendAttachmentMail(to: String, subject: String, content: String, file: Path) = + sender.send(sender.createMimeMessage().apply { + MimeMessageHelper(this, true).apply { + setFrom(TestMailSender.from) + setTo(to) + setSubject(subject) + setText(content) + addAttachment(file.fileName.toString(), FileSystemResource(file)) + } + }) } \ No newline at end of file diff --git a/Mail/demo/src/main/resources/application.yml b/Mail/demo/src/main/resources/application.yml index 52bf5287c5be95faef1334dd0081f5bd711b544e..f9600b3ba82eb7d79fba63e601ea5209f979cb1d 100644 --- a/Mail/demo/src/main/resources/application.yml +++ b/Mail/demo/src/main/resources/application.yml @@ -1,10 +1,9 @@ spring: mail: host: smtp.qq.com - username: ENC(5CSiFNWbI8kmmubimO+mEThdaNPp0IaTE6mA22qHV77T2gHjAcu66eH8k3Xkrq8S) - password: ENC(oirUCPalCo8oGqRYBUw2/e6cxcXLM4eHufwB6YJjDAOIhpQInA89D9I8BLwVfKA/) + username: ENC(XDBbgMG83fE/4TMzP3GDYcX9ixWDoEgYXGqpuyNDYeVb8t5CmKJWzc5XR8VQDnSk) + password: ENC(lnPGSxpiXbL7q26ORR8M7qzfh3jqNZlUDle5IbTVyUhux67Us4eu5f6xXptSjFIv) port: 465 - default-encoding: UTF-8 properties: mail: smtp: @@ -15,6 +14,6 @@ spring: enable: true required: true -jasypt: - encryptor: - password: test +#jasypt: +# encryptor: +# password: test \ No newline at end of file diff --git a/Mail/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt b/Mail/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt index 4d9cee4189b24004b33f62b29ab859138e487c89..b28f28da62bd3302f71d1562466d5e7d2bf19bfc 100644 --- a/Mail/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt +++ b/Mail/demo/src/test/kotlin/com/example/demo/DemoApplicationTests.kt @@ -7,14 +7,16 @@ import java.nio.file.Path @SpringBootTest class DemoApplicationTests { + @Autowired lateinit var service: MailService @Test fun contextLoads() { - service.sendSimpleMail("xxx@xxx.com", "这是主题", "这是内容") - service.sendAttachmentMail("xxx@xxx.com", "这是主题", "这是内容", Path.of(javaClass.classLoader.getResource("pic/1.jpg")?.toURI())) - service.sendAttachmentMail("xxx@xxx.com", "这是主题", "这是内容", Path.of("/","home","xxx","Desktop","1.jpg")) + service.sendSimpleMail("xxxxx@xx.com", "这是主题", "这是内容") + javaClass.classLoader.getResource("pic/1.jpg")?.toURI()?.let { + service.sendAttachmentMail("xxxxx@xx.com", "这是主题", "这是内容", Path.of(it)) + } } } diff --git a/Mail/demo/src/test/kotlin/com/example/demo/EncryptAndDecrypt.kt b/Mail/demo/src/test/kotlin/com/example/demo/EncryptAndDecryptTests.kt old mode 100755 new mode 100644 similarity index 53% rename from Mail/demo/src/test/kotlin/com/example/demo/EncryptAndDecrypt.kt rename to Mail/demo/src/test/kotlin/com/example/demo/EncryptAndDecryptTests.kt index b1216132ef61f33d372c424946ecaef30376ff08..d68399fb753ae433e1ac7a4c42cdf1fdfb94c809 --- a/Mail/demo/src/test/kotlin/com/example/demo/EncryptAndDecrypt.kt +++ b/Mail/demo/src/test/kotlin/com/example/demo/EncryptAndDecryptTests.kt @@ -7,29 +7,18 @@ import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest @SpringBootTest -class EncryptAndDecrypt { +class EncryptAndDecryptTests { @Autowired lateinit var encryptor: StringEncryptor - companion object { - var username = "" - var password = "" - } - @Value("\${spring.mail.username}") - fun setUsername(value: String) { - username = value - } - + lateinit var username:String @Value("\${spring.mail.password}") - fun setPassword(value: String) { - password = value - } + lateinit var password:String @Test - fun getEncrypted() = println(encryptor.encrypt(username) + "\n" + encryptor.encrypt(password)) + fun encrypt() = println(encryptor.encrypt(username) + "\n" + encryptor.encrypt(password)) @Test - fun getDecrypted() = println(username + "\n" + password) - + fun decrypt() = println(username + "\n" + password) } \ No newline at end of file diff --git a/Mail/pic/1.png b/Mail/pic/1.png new file mode 100644 index 0000000000000000000000000000000000000000..a3d7f76ad70b07408953bbfde36b7eeaab1ae6ab Binary files /dev/null and b/Mail/pic/1.png differ diff --git a/Mail/pic/2.png b/Mail/pic/2.png new file mode 100644 index 0000000000000000000000000000000000000000..f8896d8eb0e3face3823517d375cd8dfda0c0a64 Binary files /dev/null and b/Mail/pic/2.png differ diff --git a/README.md b/README.md index 5fa2e525a45ce282165968becc67bd10421e0f81..db3dd0f6fa05b6a3d35fccf38c86550f07a51db9 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 1 Spring Boot demo +# 1 Spring Boot Demo 该仓库是`Spring Boot`的`Demo`合集，使用`Kotlin`实现。 @@ -9,6 +9,8 @@ - `Kotlin 1.6.21+` - `build.gradle.kts` +各个`Demo`的一些额外环境可以查看各个`Demo`的`README.md`。 + # 3 目前已实现 - [Helloworld](https://github.com/gkdgkdgkdgkd/SpringBootDemoKotlin/tree/main/DemoHelloworld)