diff --git a/bbs-service/.gitignore b/bbs-service/.gitignore deleted file mode 100644 index 549e00a..0000000 --- a/bbs-service/.gitignore +++ /dev/null @@ -1,33 +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/ diff --git a/bbs-service/.mvn/wrapper/MavenWrapperDownloader.java b/bbs-service/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index a45eb6b..0000000 --- a/bbs-service/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * 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/bbs-service/.mvn/wrapper/maven-wrapper.jar b/bbs-service/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 2cc7d4a..0000000 Binary files a/bbs-service/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/bbs-service/.mvn/wrapper/maven-wrapper.properties b/bbs-service/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 642d572..0000000 --- a/bbs-service/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,2 +0,0 @@ -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/bbs-service/mvnw b/bbs-service/mvnw deleted file mode 100644 index a16b543..0000000 --- a/bbs-service/mvnw +++ /dev/null @@ -1,310 +0,0 @@ -#!/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/bbs-service/mvnw.cmd b/bbs-service/mvnw.cmd deleted file mode 100644 index c8d4337..0000000 --- a/bbs-service/mvnw.cmd +++ /dev/null @@ -1,182 +0,0 @@ -@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/bbs-service/pom.xml b/bbs-service/pom.xml deleted file mode 100644 index caf8740..0000000 --- a/bbs-service/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - 4.0.0 - - - assucloud - com.assu.cloud - 0.0.1-SNAPSHOT - ../pom.xml - - - com.assu.cloud - bbs-service - 0.0.1-SNAPSHOT - bbs-service - BBS Microservice - - - UTF-8 - 11 - Hoxton.SR8 - - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.security - spring-security-rsa - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - - - - org.springframework.cloud - spring-cloud-starter-netflix-hystrix - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/bbs-service/src/main/java/com/assu/cloud/bbsservice/BbsServiceApplication.java b/bbs-service/src/main/java/com/assu/cloud/bbsservice/BbsServiceApplication.java deleted file mode 100644 index 1fadc07..0000000 --- a/bbs-service/src/main/java/com/assu/cloud/bbsservice/BbsServiceApplication.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.assu.cloud.bbsservice; - -import com.assu.cloud.bbsservice.utils.CustomContextInterceptor; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.loadbalancer.LoadBalanced; -import org.springframework.cloud.netflix.eureka.EnableEurekaClient; -import org.springframework.context.annotation.Bean; -import org.springframework.web.client.RestTemplate; - -import java.util.Collections; -import java.util.List; - -@SpringBootApplication -@EnableEurekaClient -@EnableCircuitBreaker // Hystrix -public class BbsServiceApplication { - - public static void main(String[] args) { - SpringApplication.run(BbsServiceApplication.class, args); - } - // 기본 RestTemplate - @LoadBalanced // 스프링 클라우드가 리본이 지원하는 RestTemplate 클래스 생성하도록 지시 - @Bean - public RestTemplate getRestTemplate() { - // return new RestTemplate(); - RestTemplate template = new RestTemplate(); - List interceptors = template.getInterceptors(); - - if (interceptors == null) { - template.setInterceptors(Collections.singletonList(new CustomContextInterceptor())); - } else { - interceptors.add(new CustomContextInterceptor()); - template.setInterceptors(interceptors); - } - return template; - } -} diff --git a/bbs-service/src/main/java/com/assu/cloud/bbsservice/controller/BbsController.java b/bbs-service/src/main/java/com/assu/cloud/bbsservice/controller/BbsController.java deleted file mode 100644 index ea211e1..0000000 --- a/bbs-service/src/main/java/com/assu/cloud/bbsservice/controller/BbsController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.assu.cloud.bbsservice.controller; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.servlet.ServletRequest; - -@RestController -@RequestMapping("/bbs") -public class BbsController { - private static final Logger logger = LoggerFactory.getLogger(BbsController.class); - - @GetMapping(value = "gift/{name}") - public String gift(@PathVariable("name") String gift) { - return "[BBS] Gift is " + gift; - } -} diff --git a/bbs-service/src/main/java/com/assu/cloud/bbsservice/utils/CustomContext.java b/bbs-service/src/main/java/com/assu/cloud/bbsservice/utils/CustomContext.java deleted file mode 100644 index 334cb26..0000000 --- a/bbs-service/src/main/java/com/assu/cloud/bbsservice/utils/CustomContext.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.assu.cloud.bbsservice.utils; - -import org.springframework.stereotype.Component; - -/** - * 서비스가 쉽게 액세스할 수 있는 HTTP 헤더를 만들어 저장하는 클래스 - * HTTP 요청에서 추출한 값을 보관하는 POJO - */ -@Component -public class CustomContext { - public static final String CORRELATION_ID = "assu-correlation-id"; - //public static final String AUTH_TOKEN = "Authorization"; - - private static final ThreadLocal correlationId = new ThreadLocal<>(); - //private static final ThreadLocal authToken = new ThreadLocal<>(); - - // 그 외 필요한 항목 넣을 수 있음 (인증 토큰 등...) - - - public static String getCorrelationId() { - return correlationId.get(); - } - - public static void setCorrelationId(String cid) { - correlationId.set(cid); - } - -} \ No newline at end of file diff --git a/bbs-service/src/main/java/com/assu/cloud/bbsservice/utils/CustomContextFilter.java b/bbs-service/src/main/java/com/assu/cloud/bbsservice/utils/CustomContextFilter.java deleted file mode 100644 index c36e463..0000000 --- a/bbs-service/src/main/java/com/assu/cloud/bbsservice/utils/CustomContextFilter.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.assu.cloud.bbsservice.utils; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import java.io.IOException; - -/** - * 유입되는 HTTP 요청을 가로채서 필요한 헤더값을 CustomContext 에 매핑 - * - * REST 서비스에 대한 모든 HTTP 요청을 가로채서 컨텍스트 정보(상관관계 ID 등)를 추출해 CustomContext 클래스에 매핑하는 HTTP 서블릿 필터 - * (즉, HTTP 헤더에서 인증 토큰과 상관관계 ID 파싱) - * - * REST 서비스 호출 시 코드에서 CustomContext 액세스가 필요할 때마다 ThreadLocal 변수에서 검색해 읽어올 수 있음 - */ -@Component -public class CustomContextFilter implements Filter { - - private static final Logger logger = LoggerFactory.getLogger(CustomContextFilter.class); - - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest; - - // HTTP 호출 헤더에서 상관관계 ID 를 검색하여 CustomContextHolder 의 CustomContext 클래스에 설정 - CustomContextHolder.getContext().setCorrelationId(httpServletRequest.getHeader(CustomContext.CORRELATION_ID)); - - // 그 외 필요한 항목 넣을 수 있음 (인증 토큰 등...) - //CustomContextHolder.getContext().setAuthToken(httpServletRequest.getHeader(CustomContext.AUTH_TOKEN)); - - logger.debug("상관관계 ID {} 로 실행된 동적 라우팅", CustomContextHolder.getContext().getCorrelationId()); - - filterChain.doFilter(httpServletRequest, servletResponse); - } - - @Override - public void init(FilterConfig filterConfig) {} - - @Override - public void destroy() {} -} diff --git a/bbs-service/src/main/java/com/assu/cloud/bbsservice/utils/CustomContextHolder.java b/bbs-service/src/main/java/com/assu/cloud/bbsservice/utils/CustomContextHolder.java deleted file mode 100644 index 689ae58..0000000 --- a/bbs-service/src/main/java/com/assu/cloud/bbsservice/utils/CustomContextHolder.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.assu.cloud.bbsservice.utils; - -import org.springframework.util.Assert; - -/** - * ThreadLocal 저장소에 CustomContext 를 저장하는 클래스 - * * ThreadLocal 변수: 사용자 요청을 처리하는 해당 스레드에서 호출되는 모든 메서드에서 액세스 가능한 변수 - * - * CustomContext 가 ThreadLocal 저장소에 저장되면 요청으로 실행된 모든 코드에서 CustomContextHolder 의 CustomContext 객체 사용 가능 - */ -public class CustomContextHolder { - - /** 정적 ThreadLocal 변수에 저장되는 CustomContext */ - private static final ThreadLocal customContext = new ThreadLocal<>(); - - /** - * CustomContext 객체를 사용하기 위해 조회해오는 메서드 - */ - public static final CustomContext getContext() { - CustomContext ctx = customContext.get(); - - if (ctx == null) { - ctx = createEmptyContext(); - customContext.set(ctx); - } - return customContext.get(); - } - - public static final void setContext(CustomContext ctx) { - Assert.notNull(ctx, "CustomContext is null."); - customContext.set(ctx); - } - - public static final CustomContext createEmptyContext() { - return new CustomContext(); - } -} diff --git a/bbs-service/src/main/java/com/assu/cloud/bbsservice/utils/CustomContextInterceptor.java b/bbs-service/src/main/java/com/assu/cloud/bbsservice/utils/CustomContextInterceptor.java deleted file mode 100644 index 6c9e35d..0000000 --- a/bbs-service/src/main/java/com/assu/cloud/bbsservice/utils/CustomContextInterceptor.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.assu.cloud.bbsservice.utils; - -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpRequest; -import org.springframework.http.client.ClientHttpRequestExecution; -import org.springframework.http.client.ClientHttpRequestInterceptor; -import org.springframework.http.client.ClientHttpResponse; - -import java.io.IOException; - -/** - * RestTemplate 인스턴스에서 실행되는 모든 HTTP 기반 서비스 발신 요청에 상관관계 ID 삽입 + 토큰 - */ -public class CustomContextInterceptor implements ClientHttpRequestInterceptor { - /** - * RestTemplate 로 실제 HTTP 서비스 호출 전 intercept 메서드 호출 - */ - @Override - public ClientHttpResponse intercept(HttpRequest httpRequest, byte[] bytes, ClientHttpRequestExecution clientHttpRequestExecution) throws IOException { - HttpHeaders headers = httpRequest.getHeaders(); - - headers.add(CustomContext.CORRELATION_ID, CustomContextHolder.getContext().getCorrelationId()); - - // 그 외 필요한 항목 넣을 수 있음 (인증 토큰 등...) - //headers.add(CustomContext.AUTH_TOKEN, CustomContextHolder.getContext().getAuthToken()); // HTTP 헤더에 인증 토큰 추가 - - return clientHttpRequestExecution.execute(httpRequest, bytes); - } -} diff --git a/bbs-service/src/main/resources/application.yaml b/bbs-service/src/main/resources/application.yaml deleted file mode 100644 index 96c1811..0000000 --- a/bbs-service/src/main/resources/application.yaml +++ /dev/null @@ -1,48 +0,0 @@ -spring: - application: - name: bbs-service # 서비스 ID (컨피그 클라이언트가 어떤 서비스를 조회하는지 매핑) - profiles: - active: default # 서비스가 실행할 기본 프로파일 -server: - port: 8060 -your.name: "BBS DEFAULT..." -management: - endpoints: - web: - exposure: - include: "*" - endpoint: - shutdown: - enabled: true -eureka: - instance: - prefer-ip-address: true # 서비스 이름 대신 IP 주소 등록 - lease-renewal-interval-in-seconds: 3 # 디스커버리한테 1초마다 하트비트 전송 (디폴트 30초) - lease-expiration-duration-in-seconds: 2 # 디스커버리는 서비스 등록 해제 하기 전에 마지막 하트비트에서부터 2초 기다림 (디폴트 90초) - client: - register-with-eureka: true # 유레카 서버에 서비스 등록 - fetch-registry: true # 레지스트리 정보를 로컬에 캐싱 - serviceUrl: - defaultZone: http://peer1:8762/eureka/ - registry-fetch-interval-seconds: 3 # 서비스 목록을 3초마다 캐싱 -logging: - level: - com.netflix: WARN - org.springframework.web: WARN - com.assu.cloud: DEBUG -service: - id: - zuul: zuulserver -security: - oauth2: - resource: - user-info-uri: http://localhost:8901/auth/user # OAuth2 콜백 URL -signing: - key: assusingkey -hystrix: - command: - default: # 유레카 서비스 ID - execution: - isolation: - thread: - timeoutInMilliseconds: 3000 # 히스트릭스 타임아웃 3초로 설정 (기본 1초, ribbon 의 타임아웃보다 커야 기대하는 대로 동작함) \ No newline at end of file diff --git a/bbs-service/src/test/java/com/assu/cloud/bbsservice/BbsServiceApplicationTests.java b/bbs-service/src/test/java/com/assu/cloud/bbsservice/BbsServiceApplicationTests.java deleted file mode 100644 index 6994510..0000000 --- a/bbs-service/src/test/java/com/assu/cloud/bbsservice/BbsServiceApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.assu.cloud.bbsservice; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class BbsServiceApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/event-service/src/main/java/com/assu/cloud/eventservice/controller/EventController.java b/event-service/src/main/java/com/assu/cloud/eventservice/controller/EventController.java index 4310270..6ba00ca 100644 --- a/event-service/src/main/java/com/assu/cloud/eventservice/controller/EventController.java +++ b/event-service/src/main/java/com/assu/cloud/eventservice/controller/EventController.java @@ -51,7 +51,15 @@ public class EventController { */ @GetMapping(value = "gift/{name}") public String gift(@PathVariable("name") String gift) { - //sleep(); + sleep(); + return "[EVENT] Gift is " + gift; + } + + /** + * 회원 서비스에서 호출할 메서드 (fallback test) + */ + @GetMapping(value = "gift2/{name}") + public String gift2(@PathVariable("name") String gift) { return "[EVENT] Gift is " + gift; } diff --git a/member-service/src/main/java/com/assu/cloud/memberservice/client/BbsRestTemplateClient.java b/member-service/src/main/java/com/assu/cloud/memberservice/client/BbsRestTemplateClient.java deleted file mode 100644 index 0e058c9..0000000 --- a/member-service/src/main/java/com/assu/cloud/memberservice/client/BbsRestTemplateClient.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.assu.cloud.memberservice.client; - -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; - -@Component -public class BbsRestTemplateClient { - - private final RestTemplate restTemplate; - - public BbsRestTemplateClient(RestTemplate restTemplate) { - this.restTemplate = restTemplate; - } - - String ZUUL_URL_PREFIX = "/api/bbs/bbs/"; // bbs 서비스의 주울 라우팅경로와 bbs 클래스 주소 - - public String gift(String name) { - /*ResponseEntity restExchange = - restTemplate.exchange( - "http://event-service/event/gift/{name}", - HttpMethod.GET, - null, EventGift.class, name - );*/ - ResponseEntity restExchange = - restTemplate.exchange( - "http://zuulserver" + ZUUL_URL_PREFIX + "gift/{name}", // http://localhost:5555/api/bbs/bbs/gift/flower - HttpMethod.GET, - null, String.class, name - ); - - return restExchange.getBody(); - } -} diff --git a/member-service/src/main/java/com/assu/cloud/memberservice/client/EventRestTemplateClient.java b/member-service/src/main/java/com/assu/cloud/memberservice/client/EventRestTemplateClient.java index a12aac6..4d2cfae 100644 --- a/member-service/src/main/java/com/assu/cloud/memberservice/client/EventRestTemplateClient.java +++ b/member-service/src/main/java/com/assu/cloud/memberservice/client/EventRestTemplateClient.java @@ -35,4 +35,21 @@ public class EventRestTemplateClient { return restExchange.getBody(); } + + public String gift2(String name) { + /*ResponseEntity restExchange = + restTemplate.exchange( + "http://event-service/event/gift/{name}", + HttpMethod.GET, + null, EventGift.class, name + );*/ + ResponseEntity restExchange = + restTemplate.exchange( + "http://" + customConfig.getServiceIdZuul() + ZUUL_URL_PREFIX + "gift2/{name}", // http://localhost:5555/api/mb/member/gift/flower + HttpMethod.GET, + null, String.class, name + ); + + return restExchange.getBody(); + } } diff --git a/member-service/src/main/java/com/assu/cloud/memberservice/controller/MemberController.java b/member-service/src/main/java/com/assu/cloud/memberservice/controller/MemberController.java index d648e48..64f0822 100644 --- a/member-service/src/main/java/com/assu/cloud/memberservice/controller/MemberController.java +++ b/member-service/src/main/java/com/assu/cloud/memberservice/controller/MemberController.java @@ -1,6 +1,5 @@ package com.assu.cloud.memberservice.controller; -import com.assu.cloud.memberservice.client.BbsRestTemplateClient; import com.assu.cloud.memberservice.client.EventRestTemplateClient; import com.assu.cloud.memberservice.config.CustomConfig; import com.assu.cloud.memberservice.event.source.SimpleSourceBean; @@ -8,7 +7,6 @@ import com.assu.cloud.memberservice.model.Member; import com.assu.cloud.memberservice.utils.CustomContextHolder; import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand; import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty; -import org.apache.tomcat.util.descriptor.web.ContextHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; @@ -24,13 +22,11 @@ public class MemberController { private final CustomConfig customConfig; private final EventRestTemplateClient eventRestTemplateClient; - private final BbsRestTemplateClient bbsRestTemplateClient; private final SimpleSourceBean simpleSourceBean; - public MemberController(CustomConfig customConfig, EventRestTemplateClient eventRestTemplateClient, BbsRestTemplateClient bbsRestTemplateClient, SimpleSourceBean simpleSourceBean) { + public MemberController(CustomConfig customConfig, EventRestTemplateClient eventRestTemplateClient, SimpleSourceBean simpleSourceBean) { this.customConfig = customConfig; this.eventRestTemplateClient = eventRestTemplateClient; - this.bbsRestTemplateClient = bbsRestTemplateClient; this.simpleSourceBean = simpleSourceBean; } @@ -130,17 +126,71 @@ public class MemberController { return "This is timeoutFallback test."; } - @HystrixCommand( //fallbackMethod = "timeoutFallback") - threadPoolKey = "mainThreadPool", - threadPoolProperties = - {@HystrixProperty(name = "coreSize", value = "30"), // 스레드풀의 스레드 갯수 - @HystrixProperty(name = "maxQueueSize", value = "10")} // 스레드 풀 앞에 배치할 큐와 큐에 넣을 요청 수 - ) - @GetMapping(value = "bulkhead/{name}") - public String bulkhead(ServletRequest req, @PathVariable("name") String name) { + @GetMapping(value = "bulkheadMain/{name}") + public String bulkheadMain(ServletRequest req, @PathVariable("name") String name) { String eventApi = eventRestTemplateClient.gift(name); - String bbsApi = bbsRestTemplateClient.gift(name); - return "[MEMBER] " + eventApi + "===" + bbsApi; + return "[MEMBER] " + eventApi; + } + + /** + * eventThreadPool 을 사용하면서 sleep() 이 있는 이벤트 서비스를 호출하는 함수 + */ + @HystrixCommand( //fallbackMethod = "timeoutFallback") + threadPoolKey = "eventThreadPool", + threadPoolProperties = + {@HystrixProperty(name = "coreSize", value = "30"), // 스레드 풀의 스레드 갯수 (디폴트 10) + @HystrixProperty(name = "maxQueueSize", value = "10")}, // 스레드 풀 앞에 배치할 큐와 큐에 넣을 요청 수 (디폴트 -1) + commandProperties = { + // 히스트릭스가 호출 차단을 고려하는데 필요한 시간인 10초(metrics.rollingStats.timeInMilliseconds) 동안 연속 호출 횟수 (디폴트 20) + @HystrixProperty(name = "circuitBreaker.requestVolumeThreshold", value = "2"), + // 서킷 브레이커가 열린 후 requestVolumeThreshold 값만큼 호출한 후 타임아웃, 예외, HTTP 500 반환등으로 실패해야 하는 호출 비율 (디폴트 50) + @HystrixProperty(name = "circuitBreaker.errorThresholdPercentage", value = "10"), + // 서킷 브레이커가 열린 후 서비스의 회복 상태를 확인할 때까지 대기할 시간 간격. 즉, 서킷 브레이커가 열렸을 때 얼마나 지속될지...(디폴트 5000) + @HystrixProperty(name = "circuitBreaker.sleepWindowInMilliseconds", value = "7000"), + // 서비스 호출 문제를 모니터할 시간 간격. 즉 서킷 브레이커가 열리기 위한 조건을 체크할 시간. (디폴트 10초) + @HystrixProperty(name = "metrics.rollingStats.timeInMilliseconds", value = "15000"), + // 설정한 시간 간격동안 통계를 수집할 횟수 (이 버킷수는 모니터 시간 간격에 균등하게 분할되어야 함 + // 여기선 15초 시간 간격을 사용하고, 3초 길이의 5개 버킷에 통계 데이터 수집 + @HystrixProperty(name = "metrics.rollingStats.numBuckets", value = "5")} + ) + @GetMapping(value = "bulkheadEvtSleep/{name}") + public String bulkheadEvtSleep(@PathVariable("name") String name) { + String eventApi = eventRestTemplateClient.gift(name); + return "[MEMBER] " + eventApi; + } + + /** + * eventThreadPool 을 사용하지만 sleep() 이 없는 이벤트 서비스를 호출하는 함수 + * 바로 위 함수에서 서킷 브레이커가 열려도 아래 함수는 정상 동작함 (스레드 풀 키를 이런 식으로 공유해서 사용할 수 없는 것 같음) + */ + @HystrixCommand( //fallbackMethod = "timeoutFallback") + threadPoolKey = "eventThreadPool", + threadPoolProperties = + {@HystrixProperty(name = "coreSize", value = "30"), // 스레드 풀의 스레드 갯수 (디폴트 10) + @HystrixProperty(name = "maxQueueSize", value = "10")}, // 스레드 풀 앞에 배치할 큐와 큐에 넣을 요청 수 (디폴트 -1) + commandProperties = { + // 히스트릭스가 호출 차단을 고려하는데 필요한 시간인 10초(metrics.rollingStats.timeInMilliseconds) 동안 연속 호출 횟수 (디폴트 20) + @HystrixProperty(name = "circuitBreaker.requestVolumeThreshold", value = "2"), + // 서킷 브레이커가 열린 후 requestVolumeThreshold 값만큼 호출한 후 타임아웃, 예외, HTTP 500 반환등으로 실패해야 하는 호출 비율 (디폴트 50) + @HystrixProperty(name = "circuitBreaker.errorThresholdPercentage", value = "75"), + // 서킷 브레이커가 열린 후 서비스의 회복 상태를 확인할 때까지 대기할 시간 간격. 즉, 서킷 브레이커가 열렸을 때 얼마나 지속될지...(디폴트 5000) + @HystrixProperty(name = "circuitBreaker.sleepWindowInMilliseconds", value = "7000"), + // 서비스 호출 문제를 모니터할 시간 간격. 즉 서킷 브레이커가 열리기 위한 조건을 체크할 시간. (디폴트 10초) + @HystrixProperty(name = "metrics.rollingStats.timeInMilliseconds", value = "15000"), + // 설정한 시간 간격동안 통계를 수집할 횟수 (이 버킷수는 모니터 시간 간격에 균등하게 분할되어야 함 + // 여기선 15초 시간 간격을 사용하고, 3초 길이의 5개 버킷에 통계 데이터 수집 + @HystrixProperty(name = "metrics.rollingStats.numBuckets", value = "5")} + ) + @GetMapping(value = "bulkheadEvtNotSleepPool/{name}") + public String bulkheadEvtPool(ServletRequest req, @PathVariable("name") String name) { + String eventApi = eventRestTemplateClient.gift2(name); + return "[MEMBER] " + eventApi; + } + + @GetMapping(value = "bulkheadEvtNotSleepNotPool/{name}") + public String bulkheadEvtNotPool(ServletRequest req, @PathVariable("name") String name) { + String eventApi = eventRestTemplateClient.gift2(name); + return "[MEMBER] " + eventApi; } /** diff --git a/pom.xml b/pom.xml index edd356a..0f12df2 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,6 @@ eurekaserver zuulserver auth-service - bbs-service diff --git a/zuulserver/src/main/resources/application.yaml b/zuulserver/src/main/resources/application.yaml index b10b2f6..0dadcb7 100644 --- a/zuulserver/src/main/resources/application.yaml +++ b/zuulserver/src/main/resources/application.yaml @@ -37,7 +37,6 @@ zuul: routes: event-service: /evt/** member-service: /mb/** - bbs-service: /bbs/** sensitive-headers: Cookie,Set-Cookie # 주울이 하위 서비스에 전파하지 않는 헤더 차단 목록 (디폴트는 Cookie, Set-Cookie, Authorization) hystrix: command: