diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml new file mode 100644 index 0000000..dc059c2 --- /dev/null +++ b/.github/workflows/ci-cd.yml @@ -0,0 +1,72 @@ +name: Java CI with Gradle + +on: + push: + paths-ignore: + - '*.md' + branches: [ "develop", "feature/ci-cd" ] # feature/ci-cd 브랜치 후에 삭제 + pull_request: + branches: [ "develop" ] +permissions: + contents: read + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + # gradle 의존성 캐싱 + - name: gradle caching + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + # 권한 설정 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + # 빌드 - 테스트 제외 - !! 필요시 테스트 포함하도록 변경하기 + - name: Build with Gradle + run: ./gradlew build -x test + # Buildx 설정 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + # 도커 허브 로그인 + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + # 도커 빌드 및 푸시 + - name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: ${{ secrets.DOCKERHUB_USERNAME }}/pyonsnalcolor:latest # !! 필요시 tag명 수정 + cache-from: type=gha # 캐시 적용 + cache-to: type=gha,mode=max + + deploy: + needs: [ build ] + runs-on: ubuntu-latest + steps: + - name: Deploy + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.SERVER_HOST }} + username: ${{ secrets.SERVER_USERNAME }} + key: ${{ secrets.SERVER_PRIVATE_KEY }} + port: ${{ secrets.SSH_PORT }} + script: | + sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/pyonsnalcolor:latest + sudo docker tag ${{ secrets.DOCKERHUB_USERNAME }}/pyonsnalcolor:latest pyonsnalcolor + sudo docker-compose up -d \ No newline at end of file diff --git a/.gitignore b/.gitignore index 4a38938..92bd92f 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,5 @@ hs_err_pid* replay_pid* # End of https://www.toptal.com/developers/gitignore/api/intellij,java +*.idea +*.iml \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 855b6e7..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 1b1466a..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 712ab9d..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 949ecce..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index c616bd5..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..cacaffb --- /dev/null +++ b/Dockerfile @@ -0,0 +1,6 @@ +FROM openjdk:11 +COPY pyonsnalcolor-member/build/libs/pyonsnalcolor-member-1.0-SNAPSHOT.jar member.jar +EXPOSE 8080 +ENTRYPOINT ["java", "-jar", "/member.jar"] + +RUN echo "pyonsnalcolor-member start" \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..e515310 --- /dev/null +++ b/build.gradle @@ -0,0 +1,45 @@ +buildscript { + ext { + springBootVersion = '2.7.12' + } + repositories { + mavenCentral() + } + dependencies { + classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") + classpath "io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE" + } +} + +allprojects {} + +subprojects { + apply plugin: 'java' + apply plugin: 'java-library' + apply plugin: 'org.springframework.boot' + apply plugin: 'io.spring.dependency-management' + + group = 'com.pyonsnalcolor' + version = '1.0' + sourceCompatibility = '11' + + repositories { + mavenCentral() + } + + dependencies { + compileOnly 'org.projectlombok:lombok:1.18.16' + annotationProcessor 'org.projectlombok:lombok:1.18.16' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation('org.springframework.boot:spring-boot-starter-test') { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } + } + + jar { + enabled = false + } + bootJar { + enabled = true + } +} \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle new file mode 100644 index 0000000..04d80d2 --- /dev/null +++ b/buildSrc/build.gradle @@ -0,0 +1,13 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. + id 'groovy-gradle-plugin' +} + +repositories { + // Use the plugin portal to apply community plugins in convention plugins. + gradlePluginPortal() +} diff --git a/buildSrc/src/main/groovy/com.pyonsnalcolor.java-conventions.gradle b/buildSrc/src/main/groovy/com.pyonsnalcolor.java-conventions.gradle new file mode 100644 index 0000000..0c2a0e6 --- /dev/null +++ b/buildSrc/src/main/groovy/com.pyonsnalcolor.java-conventions.gradle @@ -0,0 +1,38 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'java-library' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web:2.7.12' + implementation 'org.projectlombok:lombok:1.18.26' + runtimeOnly 'org.springframework.boot:spring-boot-devtools:2.7.12' + testImplementation 'org.springframework.boot:spring-boot-starter-test:2.7.12' +} + +group = 'com.pyonsnalcolor' +version = '1.0-SNAPSHOT' +java.sourceCompatibility = JavaVersion.VERSION_11 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..5a04c74 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,17 @@ +version: "3" + +services: + application: + image: pyonsnalcolor + environment: + SPRING_DATASOURCE_URL: ${DB_URL} + SPRING_DATASOURCE_USERNAME: admin + SPRING_DATASOURCE_PASSWORD: ${DB_PASSWORD} + JWT_ISSUER: ${JWT_ISSUER} + JWT_SECRET: ${JWT_SECRET} + JWT_ACCESS-TOKEN_VALIDITY: ${JWT_ACCESS_TOKEN_VALIDITY} + JWT_REFRESH-TOKEN_VALIDITY: ${JWT_REFRESH_TOKEN_VALIDITY} + SPRING_SECURITY_OAUTH2_APPLE_CLIENT_ID: ${APPLE_CLIENT_ID} + restart: always + ports: + - "8080:8080" \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..05679dc --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..744e882 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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 +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + MSYS* | MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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 + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + 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 +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 +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 + +# 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 + # 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\"" + fi + i=`expr $i + 1` + 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, 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" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem 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, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index c9d7ae1..0000000 --- a/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - org.springframework.boot - spring-boot-starter-parent - 2.7.12 - - - - 4.0.0 - - com.pyonsnalcolor - - pyonsnalcolor - - 1.0-SNAPSHOT - - - - org.apache.maven.plugins - maven-compiler-plugin - - 11 - 11 - - - - - - - 11 - 11 - - - pom - - - pyonsnalcolor-product - pyonsnalcolor-batch - pyonsnalcolor-domain - pyonsnalcolor-member - pyonsnalcolor-alarm - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - diff --git a/pyonsnalcolor-alarm/.mvn/wrapper/maven-wrapper.jar b/pyonsnalcolor-alarm/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index bf82ff0..0000000 Binary files a/pyonsnalcolor-alarm/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/pyonsnalcolor-alarm/.mvn/wrapper/maven-wrapper.properties b/pyonsnalcolor-alarm/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index ca5ab4b..0000000 --- a/pyonsnalcolor-alarm/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/pyonsnalcolor-alarm/HELP.md b/pyonsnalcolor-alarm/HELP.md deleted file mode 100644 index 16b0b13..0000000 --- a/pyonsnalcolor-alarm/HELP.md +++ /dev/null @@ -1,31 +0,0 @@ -# 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.7.12/maven-plugin/reference/html/) -* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.7.12/maven-plugin/reference/html/#build-image) -* [Spring Batch](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#howto.batch) -* [Spring Web](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#web) -* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#data.sql.jpa-and-spring-data) -* [Spring Data MongoDB](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#data.nosql.mongodb) -* [Spring Boot DevTools](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#using.devtools) -* [OpenFeign](https://docs.spring.io/spring-cloud-openfeign/docs/current/reference/html/) - -### Guides -The following guides illustrate how to use some features concretely: - -* [Creating a Batch Service](https://spring.io/guides/gs/batch-processing/) -* [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/rest/) -* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) -* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) -* [Accessing Data with MongoDB](https://spring.io/guides/gs/accessing-data-mongodb/) - -### Additional Links -These additional references should also help you: - -* [Declarative REST calls with Spring Cloud OpenFeign sample](https://github.com/spring-cloud-samples/feign-eureka) - diff --git a/pyonsnalcolor-alarm/build.gradle b/pyonsnalcolor-alarm/build.gradle new file mode 100644 index 0000000..368564d --- /dev/null +++ b/pyonsnalcolor-alarm/build.gradle @@ -0,0 +1,16 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.pyonsnalcolor.java-conventions' +} + +dependencies { + implementation project(':pyonsnalcolor-domain') + api 'org.springframework.boot:spring-boot-starter-data-jpa:2.7.12' + + implementation 'com.google.firebase:firebase-admin:9.2.0' +} + +description = 'pyonsnalcolor-alarm' diff --git a/pyonsnalcolor-alarm/build/resources/main/application.yml b/pyonsnalcolor-alarm/build/resources/main/application.yml new file mode 100644 index 0000000..2bf785e --- /dev/null +++ b/pyonsnalcolor-alarm/build/resources/main/application.yml @@ -0,0 +1,18 @@ +spring: + server: + address: localhost + port: 8080 + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + jpa: + database: mysql + database-platform: org.hibernate.dialect.MySQL8Dialect + hibernate: + ddl-auto: create + show-sql: true +fcm: + key: fcm-key.json + scope: https://www.googleapis.com/auth/firebase.messaging \ No newline at end of file diff --git a/pyonsnalcolor-alarm/mvnw b/pyonsnalcolor-alarm/mvnw deleted file mode 100644 index 8a8fb22..0000000 --- a/pyonsnalcolor-alarm/mvnw +++ /dev/null @@ -1,316 +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 /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - 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="`\\unset -f command; \\command -v 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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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" || rm -f "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$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 \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/pyonsnalcolor-alarm/mvnw.cmd b/pyonsnalcolor-alarm/mvnw.cmd deleted file mode 100644 index 1d8ab01..0000000 --- a/pyonsnalcolor-alarm/mvnw.cmd +++ /dev/null @@ -1,188 +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 "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - -FOR /F "usebackq 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%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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 "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\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% - -cmd /C exit /B %ERROR_CODE% diff --git a/pyonsnalcolor-alarm/pom.xml b/pyonsnalcolor-alarm/pom.xml deleted file mode 100644 index eaa6f94..0000000 --- a/pyonsnalcolor-alarm/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - 4.0.0 - - pyonsnalcolor - com.pyonsnalcolor - 1.0-SNAPSHOT - - com.pyonsnalcolor - pyonsnalcolor-alarm - 1.0-SNAPSHOT - pyonsnalcolor-alarm - Demo project for Spring Boot - - 11 - 2021.0.7 - - - - - - com.pyonsnalcolor - pyonsnalcolor-domain - 1.0-SNAPSHOT - - - com.google.firebase - firebase-admin - 9.2.0 - - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - ${java.version} - ${java.version} - ${java.version} - - - - - diff --git a/pyonsnalcolor-alarm/pyonsnalcolor-alarm.iml b/pyonsnalcolor-alarm/pyonsnalcolor-alarm.iml deleted file mode 100644 index 8a8a27b..0000000 --- a/pyonsnalcolor-alarm/pyonsnalcolor-alarm.iml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/AlarmApplication.java b/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/AlarmApplication.java new file mode 100644 index 0000000..dec9ed8 --- /dev/null +++ b/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/AlarmApplication.java @@ -0,0 +1,13 @@ +package com.pyonsnalcolor; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AlarmApplication { + + public static void main(String[] args) { + SpringApplication.run(AlarmApplication.class, args); + } + +} diff --git a/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/AlarmApplication.java b/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/AlarmApplication.java deleted file mode 100644 index 2e46b85..0000000 --- a/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/AlarmApplication.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.pyonsnalcolor.alarm; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; - -@EntityScan(basePackages = {"com.pyonsnalcolor.domain"}) -@EnableJpaRepositories(basePackages = {"com.pyonsnalcolor.domain"}) -@SpringBootApplication -public class AlarmApplication { - - public static void main(String[] args) { - SpringApplication.run(AlarmApplication.class, args); - } - -} diff --git a/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/dto/DeviceTokenRequestDto.java b/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/dto/DeviceTokenRequestDto.java similarity index 86% rename from pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/dto/DeviceTokenRequestDto.java rename to pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/dto/DeviceTokenRequestDto.java index 9c673f1..9ef1248 100644 --- a/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/dto/DeviceTokenRequestDto.java +++ b/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/dto/DeviceTokenRequestDto.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.alarm.dto; +package com.pyonsnalcolor.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/dto/FcmMessageType.java b/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/dto/FcmMessageType.java similarity index 97% rename from pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/dto/FcmMessageType.java rename to pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/dto/FcmMessageType.java index aa88059..0e5c403 100644 --- a/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/dto/FcmMessageType.java +++ b/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/dto/FcmMessageType.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.alarm.dto; +package com.pyonsnalcolor.dto; import com.google.firebase.messaging.Message; import com.google.firebase.messaging.Notification; diff --git a/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/fcm/FcmController.java b/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/fcm/FcmController.java similarity index 88% rename from pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/fcm/FcmController.java rename to pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/fcm/FcmController.java index 9dbb98d..4e91fbd 100644 --- a/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/fcm/FcmController.java +++ b/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/fcm/FcmController.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.alarm.fcm; +package com.pyonsnalcolor.fcm; -import com.pyonsnalcolor.alarm.dto.DeviceTokenRequestDto; +import com.pyonsnalcolor.dto.DeviceTokenRequestDto; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/fcm/FcmPushService.java b/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/fcm/FcmPushService.java similarity index 92% rename from pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/fcm/FcmPushService.java rename to pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/fcm/FcmPushService.java index 1542d19..7f80a80 100644 --- a/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/alarm/fcm/FcmPushService.java +++ b/pyonsnalcolor-alarm/src/main/java/com/pyonsnalcolor/fcm/FcmPushService.java @@ -1,11 +1,11 @@ -package com.pyonsnalcolor.alarm.fcm; +package com.pyonsnalcolor.fcm; import com.google.auth.oauth2.GoogleCredentials; import com.google.firebase.FirebaseApp; import com.google.firebase.FirebaseOptions; import com.google.firebase.messaging.FirebaseMessaging; import com.google.firebase.messaging.Message; -import com.pyonsnalcolor.alarm.dto.DeviceTokenRequestDto; +import com.pyonsnalcolor.dto.DeviceTokenRequestDto; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -17,7 +17,7 @@ import java.util.Arrays; import java.util.concurrent.ExecutionException; -import static com.pyonsnalcolor.alarm.dto.FcmMessageType.*; +import static com.pyonsnalcolor.dto.FcmMessageType.*; @Slf4j @Service diff --git a/pyonsnalcolor-alarm/target/classes/com/pyonsnalcolor/member/YappApplication.class b/pyonsnalcolor-alarm/target/classes/com/pyonsnalcolor/member/YappApplication.class deleted file mode 100644 index f3a9a41..0000000 Binary files a/pyonsnalcolor-alarm/target/classes/com/pyonsnalcolor/member/YappApplication.class and /dev/null differ diff --git a/pyonsnalcolor-alarm/target/classes/com/pyonsnalcolor/product/YappApplication.class b/pyonsnalcolor-alarm/target/classes/com/pyonsnalcolor/product/YappApplication.class deleted file mode 100644 index 96a0d05..0000000 Binary files a/pyonsnalcolor-alarm/target/classes/com/pyonsnalcolor/product/YappApplication.class and /dev/null differ diff --git a/pyonsnalcolor-alarm/target/test-classes/com/pyonsnalcolor/YappApplicationTests.class b/pyonsnalcolor-alarm/target/test-classes/com/pyonsnalcolor/YappApplicationTests.class deleted file mode 100644 index bb95c9b..0000000 Binary files a/pyonsnalcolor-alarm/target/test-classes/com/pyonsnalcolor/YappApplicationTests.class and /dev/null differ diff --git a/pyonsnalcolor-alarm/target/test-classes/com/pyonsnalcolor/member/YappApplicationTests.class b/pyonsnalcolor-alarm/target/test-classes/com/pyonsnalcolor/member/YappApplicationTests.class deleted file mode 100644 index 96f356d..0000000 Binary files a/pyonsnalcolor-alarm/target/test-classes/com/pyonsnalcolor/member/YappApplicationTests.class and /dev/null differ diff --git a/pyonsnalcolor-alarm/target/test-classes/com/pyonsnalcolor/product/YappApplicationTests.class b/pyonsnalcolor-alarm/target/test-classes/com/pyonsnalcolor/product/YappApplicationTests.class deleted file mode 100644 index 9b4b2e3..0000000 Binary files a/pyonsnalcolor-alarm/target/test-classes/com/pyonsnalcolor/product/YappApplicationTests.class and /dev/null differ diff --git a/pyonsnalcolor-batch/.mvn/wrapper/maven-wrapper.jar b/pyonsnalcolor-batch/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index bf82ff0..0000000 Binary files a/pyonsnalcolor-batch/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/pyonsnalcolor-batch/.mvn/wrapper/maven-wrapper.properties b/pyonsnalcolor-batch/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index ca5ab4b..0000000 --- a/pyonsnalcolor-batch/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/pyonsnalcolor-batch/HELP.md b/pyonsnalcolor-batch/HELP.md deleted file mode 100644 index 16b0b13..0000000 --- a/pyonsnalcolor-batch/HELP.md +++ /dev/null @@ -1,31 +0,0 @@ -# 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.7.12/maven-plugin/reference/html/) -* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.7.12/maven-plugin/reference/html/#build-image) -* [Spring Batch](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#howto.batch) -* [Spring Web](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#web) -* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#data.sql.jpa-and-spring-data) -* [Spring Data MongoDB](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#data.nosql.mongodb) -* [Spring Boot DevTools](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#using.devtools) -* [OpenFeign](https://docs.spring.io/spring-cloud-openfeign/docs/current/reference/html/) - -### Guides -The following guides illustrate how to use some features concretely: - -* [Creating a Batch Service](https://spring.io/guides/gs/batch-processing/) -* [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/rest/) -* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) -* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) -* [Accessing Data with MongoDB](https://spring.io/guides/gs/accessing-data-mongodb/) - -### Additional Links -These additional references should also help you: - -* [Declarative REST calls with Spring Cloud OpenFeign sample](https://github.com/spring-cloud-samples/feign-eureka) - diff --git a/pyonsnalcolor-batch/build.gradle b/pyonsnalcolor-batch/build.gradle new file mode 100644 index 0000000..5ea30c4 --- /dev/null +++ b/pyonsnalcolor-batch/build.gradle @@ -0,0 +1,20 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.pyonsnalcolor.java-conventions' +} + +dependencies { + implementation 'org.jsoup:jsoup:1.16.1' + implementation 'org.springframework.boot:spring-boot-starter-batch:2.7.12' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa:2.7.12' + implementation 'org.springframework.boot:spring-boot-starter-data-mongodb:2.7.12' + implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:3.1.7' + runtimeOnly 'com.h2database:h2:2.1.214' + runtimeOnly 'com.mysql:mysql-connector-j:8.0.33' + testImplementation 'org.springframework.batch:spring-batch-test:4.3.8' +} + +description = 'pyonsnalcolor-batch' diff --git a/pyonsnalcolor-batch/target/classes/application.properties b/pyonsnalcolor-batch/build/resources/main/application.properties similarity index 100% rename from pyonsnalcolor-batch/target/classes/application.properties rename to pyonsnalcolor-batch/build/resources/main/application.properties diff --git a/pyonsnalcolor-batch/mvnw b/pyonsnalcolor-batch/mvnw deleted file mode 100644 index 8a8fb22..0000000 --- a/pyonsnalcolor-batch/mvnw +++ /dev/null @@ -1,316 +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 /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - 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="`\\unset -f command; \\command -v 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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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" || rm -f "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$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 \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/pyonsnalcolor-batch/mvnw.cmd b/pyonsnalcolor-batch/mvnw.cmd deleted file mode 100644 index 1d8ab01..0000000 --- a/pyonsnalcolor-batch/mvnw.cmd +++ /dev/null @@ -1,188 +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 "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - -FOR /F "usebackq 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%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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 "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\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% - -cmd /C exit /B %ERROR_CODE% diff --git a/pyonsnalcolor-batch/pom.xml b/pyonsnalcolor-batch/pom.xml deleted file mode 100644 index 75110c7..0000000 --- a/pyonsnalcolor-batch/pom.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - 4.0.0 - - pyonsnalcolor - com.pyonsnalcolor - 1.0-SNAPSHOT - - com.pyonsnalcolor - pyonsnalcolor-batch - 1.0-SNAPSHOT - pyonsnalcolor-batch - Demo project for Spring Boot - - 11 - 2021.0.7 - 11 - 11 - - - - - org.jsoup - jsoup - 1.16.1 - - - org.springframework.boot - spring-boot-starter-batch - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-data-mongodb - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - com.h2database - h2 - runtime - - - com.mysql - mysql-connector-j - runtime - - - - - org.springframework.batch - spring-batch-test - test - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - diff --git a/pyonsnalcolor-batch/pyonsnalcolor-batch.iml b/pyonsnalcolor-batch/pyonsnalcolor-batch.iml deleted file mode 100644 index a45c091..0000000 --- a/pyonsnalcolor-batch/pyonsnalcolor-batch.iml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/BatchApplication.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/BatchApplication.java similarity index 94% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/BatchApplication.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/BatchApplication.java index 7ec748f..3ae2ba4 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/BatchApplication.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/BatchApplication.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch; +package com.pyonsnalcolor; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/PbBatchService.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/PbBatchService.java deleted file mode 100644 index 3b022c1..0000000 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/PbBatchService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.pyonsnalcolor.batch.service; - -import com.pyonsnalcolor.batch.model.BasePbProduct; -import com.pyonsnalcolor.batch.model.StoreType; -import com.pyonsnalcolor.batch.repository.PbProductRepository; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -public abstract class PbBatchService extends BasicBatchServiceTemplate { - public PbBatchService(PbProductRepository pbProductRepository) { - super(pbProductRepository); - } -} diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/client/GS25Client.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/client/GS25Client.java similarity index 96% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/client/GS25Client.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/client/GS25Client.java index b5f4691..a3cb738 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/client/GS25Client.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/client/GS25Client.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.client; +package com.pyonsnalcolor.client; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/client/GS25EventRequestBody.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/client/GS25EventRequestBody.java similarity index 90% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/client/GS25EventRequestBody.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/client/GS25EventRequestBody.java index 90746c9..c60409c 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/client/GS25EventRequestBody.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/client/GS25EventRequestBody.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.client; +package com.pyonsnalcolor.client; import lombok.Getter; import lombok.Setter; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/client/GS25PbRequestBody.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/client/GS25PbRequestBody.java similarity index 92% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/client/GS25PbRequestBody.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/client/GS25PbRequestBody.java index 46da881..9d74c48 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/client/GS25PbRequestBody.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/client/GS25PbRequestBody.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.client; +package com.pyonsnalcolor.client; import lombok.Getter; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/BaseEventProduct.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/BaseEventProduct.java similarity index 91% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/BaseEventProduct.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/BaseEventProduct.java index 541623c..d918828 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/BaseEventProduct.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/BaseEventProduct.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.model; +package com.pyonsnalcolor.model; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/BasePbProduct.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/BasePbProduct.java similarity index 89% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/BasePbProduct.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/BasePbProduct.java index b5ed213..d93e93f 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/BasePbProduct.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/BasePbProduct.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.model; +package com.pyonsnalcolor.model; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/BaseProduct.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/BaseProduct.java similarity index 93% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/BaseProduct.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/BaseProduct.java index 79f206c..9ca2805 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/BaseProduct.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/BaseProduct.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.model; +package com.pyonsnalcolor.model; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/DatabaseSequence.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/DatabaseSequence.java similarity index 87% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/DatabaseSequence.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/DatabaseSequence.java index 76eb61d..42d3c47 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/DatabaseSequence.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/DatabaseSequence.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.model; +package com.pyonsnalcolor.model; import lombok.Getter; import org.springframework.data.annotation.Id; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/EventType.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/EventType.java similarity index 92% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/EventType.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/EventType.java index c9c3b22..c0b8d24 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/EventType.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/EventType.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.model; +package com.pyonsnalcolor.model; import lombok.Getter; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/StoreType.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/StoreType.java similarity index 70% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/StoreType.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/StoreType.java index 9cbe23a..b247cdf 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/StoreType.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/StoreType.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.model; +package com.pyonsnalcolor.model; import lombok.Getter; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/UUIDGenerator.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/UUIDGenerator.java similarity index 80% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/UUIDGenerator.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/UUIDGenerator.java index 1809196..e6c1df3 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/model/UUIDGenerator.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/model/UUIDGenerator.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.model; +package com.pyonsnalcolor.model; import java.util.UUID; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/repository/BasicProductRepository.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/repository/BasicProductRepository.java similarity index 76% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/repository/BasicProductRepository.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/repository/BasicProductRepository.java index 0a59aad..fae1afb 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/repository/BasicProductRepository.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/repository/BasicProductRepository.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.batch.repository; +package com.pyonsnalcolor.repository; -import com.pyonsnalcolor.batch.model.StoreType; +import com.pyonsnalcolor.model.StoreType; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.repository.NoRepositoryBean; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/repository/EventProductRepository.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/repository/EventProductRepository.java similarity index 62% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/repository/EventProductRepository.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/repository/EventProductRepository.java index 1acdd7a..fa4bab0 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/repository/EventProductRepository.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/repository/EventProductRepository.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.batch.repository; +package com.pyonsnalcolor.repository; -import com.pyonsnalcolor.batch.model.BaseEventProduct; +import com.pyonsnalcolor.model.BaseEventProduct; import org.springframework.stereotype.Repository; @Repository diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/repository/PbProductRepository.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/repository/PbProductRepository.java similarity index 62% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/repository/PbProductRepository.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/repository/PbProductRepository.java index e6694d6..a30239a 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/repository/PbProductRepository.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/repository/PbProductRepository.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.batch.repository; +package com.pyonsnalcolor.repository; -import com.pyonsnalcolor.batch.model.BasePbProduct; +import com.pyonsnalcolor.model.BasePbProduct; import org.springframework.stereotype.Repository; @Repository diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/repository/SequenceRepository.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/repository/SequenceRepository.java similarity index 90% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/repository/SequenceRepository.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/repository/SequenceRepository.java index 7e1689f..d3b9027 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/repository/SequenceRepository.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/repository/SequenceRepository.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.batch.repository; +package com.pyonsnalcolor.repository; -import com.pyonsnalcolor.batch.model.DatabaseSequence; +import com.pyonsnalcolor.model.DatabaseSequence; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.query.Update; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/Scheduler.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/Scheduler.java similarity index 77% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/Scheduler.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/Scheduler.java index 73c85f4..c20d035 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/Scheduler.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/Scheduler.java @@ -1,7 +1,6 @@ -package com.pyonsnalcolor.batch.schedule; +package com.pyonsnalcolor.schedule; -import com.pyonsnalcolor.batch.service.BatchService; -import org.springframework.scheduling.annotation.Scheduled; +import com.pyonsnalcolor.service.BatchService; public abstract class Scheduler { private BatchService pbProductBatchService; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/cu/CuProductScheduler.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/cu/CuProductScheduler.java similarity index 76% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/cu/CuProductScheduler.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/cu/CuProductScheduler.java index 75b821a..9ff23f0 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/cu/CuProductScheduler.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/cu/CuProductScheduler.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.batch.schedule.cu; +package com.pyonsnalcolor.schedule.cu; -import com.pyonsnalcolor.batch.schedule.Scheduler; -import com.pyonsnalcolor.batch.service.BatchService; +import com.pyonsnalcolor.schedule.Scheduler; +import com.pyonsnalcolor.service.BatchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/emart24/Emart24ProductScheduler.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/emart24/Emart24ProductScheduler.java similarity index 77% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/emart24/Emart24ProductScheduler.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/emart24/Emart24ProductScheduler.java index fce5304..3b4c761 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/emart24/Emart24ProductScheduler.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/emart24/Emart24ProductScheduler.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.batch.schedule.emart24; +package com.pyonsnalcolor.schedule.emart24; -import com.pyonsnalcolor.batch.schedule.Scheduler; -import com.pyonsnalcolor.batch.service.BatchService; +import com.pyonsnalcolor.schedule.Scheduler; +import com.pyonsnalcolor.service.BatchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/gs25/GS25ProductScheduler.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/gs25/GS25ProductScheduler.java similarity index 76% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/gs25/GS25ProductScheduler.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/gs25/GS25ProductScheduler.java index 66c31c7..a547430 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/gs25/GS25ProductScheduler.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/gs25/GS25ProductScheduler.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.batch.schedule.gs25; +package com.pyonsnalcolor.schedule.gs25; -import com.pyonsnalcolor.batch.schedule.Scheduler; -import com.pyonsnalcolor.batch.service.BatchService; +import com.pyonsnalcolor.schedule.Scheduler; +import com.pyonsnalcolor.service.BatchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/seven/SevenProductScheduler.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/seven/SevenProductScheduler.java similarity index 76% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/seven/SevenProductScheduler.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/seven/SevenProductScheduler.java index 6139a0f..ea066b5 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/schedule/seven/SevenProductScheduler.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/schedule/seven/SevenProductScheduler.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.batch.schedule.seven; +package com.pyonsnalcolor.schedule.seven; -import com.pyonsnalcolor.batch.schedule.Scheduler; -import com.pyonsnalcolor.batch.service.BatchService; +import com.pyonsnalcolor.schedule.Scheduler; +import com.pyonsnalcolor.service.BatchService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/BasicBatchServiceTemplate.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/BasicBatchServiceTemplate.java similarity index 90% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/BasicBatchServiceTemplate.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/BasicBatchServiceTemplate.java index 731e28c..2cec376 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/BasicBatchServiceTemplate.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/BasicBatchServiceTemplate.java @@ -1,8 +1,8 @@ -package com.pyonsnalcolor.batch.service; +package com.pyonsnalcolor.service; -import com.pyonsnalcolor.batch.model.BaseProduct; -import com.pyonsnalcolor.batch.model.StoreType; -import com.pyonsnalcolor.batch.repository.BasicProductRepository; +import com.pyonsnalcolor.model.BaseProduct; +import com.pyonsnalcolor.model.StoreType; +import com.pyonsnalcolor.repository.BasicProductRepository; import java.util.Collections; import java.util.List; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/BatchService.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/BatchService.java similarity index 57% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/BatchService.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/BatchService.java index ca5612d..0fde6d1 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/BatchService.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/BatchService.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.service; +package com.pyonsnalcolor.service; public interface BatchService { void execute(); diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/EventBatchService.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/EventBatchService.java similarity index 83% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/EventBatchService.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/EventBatchService.java index 8faee65..44a73ac 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/EventBatchService.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/EventBatchService.java @@ -1,8 +1,8 @@ -package com.pyonsnalcolor.batch.service; +package com.pyonsnalcolor.service; -import com.pyonsnalcolor.batch.model.BaseEventProduct; -import com.pyonsnalcolor.batch.model.StoreType; -import com.pyonsnalcolor.batch.repository.EventProductRepository; +import com.pyonsnalcolor.model.BaseEventProduct; +import com.pyonsnalcolor.model.StoreType; +import com.pyonsnalcolor.repository.EventProductRepository; import java.util.Collections; import java.util.List; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/PbBatchService.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/PbBatchService.java new file mode 100644 index 0000000..80aeff9 --- /dev/null +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/PbBatchService.java @@ -0,0 +1,10 @@ +package com.pyonsnalcolor.service; + +import com.pyonsnalcolor.model.BasePbProduct; +import com.pyonsnalcolor.repository.PbProductRepository; + +public abstract class PbBatchService extends BasicBatchServiceTemplate { + public PbBatchService(PbProductRepository pbProductRepository) { + super(pbProductRepository); + } +} diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/cu/CuEventBatchService.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/cu/CuEventBatchService.java similarity index 88% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/cu/CuEventBatchService.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/cu/CuEventBatchService.java index 6889e0f..a25deef 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/cu/CuEventBatchService.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/cu/CuEventBatchService.java @@ -1,10 +1,10 @@ -package com.pyonsnalcolor.batch.service.cu; +package com.pyonsnalcolor.service.cu; -import com.pyonsnalcolor.batch.model.BaseEventProduct; -import com.pyonsnalcolor.batch.model.EventType; -import com.pyonsnalcolor.batch.model.StoreType; -import com.pyonsnalcolor.batch.repository.EventProductRepository; -import com.pyonsnalcolor.batch.service.EventBatchService; +import com.pyonsnalcolor.model.BaseEventProduct; +import com.pyonsnalcolor.model.EventType; +import com.pyonsnalcolor.model.StoreType; +import com.pyonsnalcolor.repository.EventProductRepository; +import com.pyonsnalcolor.service.EventBatchService; import lombok.extern.slf4j.Slf4j; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -19,7 +19,7 @@ import java.util.List; import java.util.stream.Collectors; -import static com.pyonsnalcolor.batch.model.UUIDGenerator.generateId; +import static com.pyonsnalcolor.model.UUIDGenerator.generateId; @Service("CuEvent") @Slf4j diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/cu/CuPbBatchService.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/cu/CuPbBatchService.java similarity index 92% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/cu/CuPbBatchService.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/cu/CuPbBatchService.java index 2e34812..1b1a46e 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/cu/CuPbBatchService.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/cu/CuPbBatchService.java @@ -1,9 +1,9 @@ -package com.pyonsnalcolor.batch.service.cu; +package com.pyonsnalcolor.service.cu; -import com.pyonsnalcolor.batch.model.BasePbProduct; -import com.pyonsnalcolor.batch.model.StoreType; -import com.pyonsnalcolor.batch.repository.PbProductRepository; -import com.pyonsnalcolor.batch.service.PbBatchService; +import com.pyonsnalcolor.model.BasePbProduct; +import com.pyonsnalcolor.model.StoreType; +import com.pyonsnalcolor.repository.PbProductRepository; +import com.pyonsnalcolor.service.PbBatchService; import lombok.extern.slf4j.Slf4j; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/emart24/Emart24EventBatchService.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/emart24/Emart24EventBatchService.java similarity index 92% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/emart24/Emart24EventBatchService.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/emart24/Emart24EventBatchService.java index 03d6e50..21a6eff 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/emart24/Emart24EventBatchService.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/emart24/Emart24EventBatchService.java @@ -1,10 +1,10 @@ -package com.pyonsnalcolor.batch.service.emart24; +package com.pyonsnalcolor.service.emart24; -import com.pyonsnalcolor.batch.model.BaseEventProduct; -import com.pyonsnalcolor.batch.model.EventType; -import com.pyonsnalcolor.batch.model.StoreType; -import com.pyonsnalcolor.batch.repository.EventProductRepository; -import com.pyonsnalcolor.batch.service.EventBatchService; +import com.pyonsnalcolor.model.BaseEventProduct; +import com.pyonsnalcolor.model.EventType; +import com.pyonsnalcolor.model.StoreType; +import com.pyonsnalcolor.repository.EventProductRepository; +import com.pyonsnalcolor.service.EventBatchService; import lombok.extern.slf4j.Slf4j; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -18,7 +18,7 @@ import java.util.Collections; import java.util.List; -import static com.pyonsnalcolor.batch.model.UUIDGenerator.generateId; +import static com.pyonsnalcolor.model.UUIDGenerator.generateId; @Service("Emart24Event") @Slf4j diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/emart24/Emart24PbBatchService.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/emart24/Emart24PbBatchService.java similarity index 89% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/emart24/Emart24PbBatchService.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/emart24/Emart24PbBatchService.java index afc9f9a..52faa2c 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/emart24/Emart24PbBatchService.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/emart24/Emart24PbBatchService.java @@ -1,9 +1,9 @@ -package com.pyonsnalcolor.batch.service.emart24; +package com.pyonsnalcolor.service.emart24; -import com.pyonsnalcolor.batch.model.BasePbProduct; -import com.pyonsnalcolor.batch.model.StoreType; -import com.pyonsnalcolor.batch.repository.PbProductRepository; -import com.pyonsnalcolor.batch.service.PbBatchService; +import com.pyonsnalcolor.model.BasePbProduct; +import com.pyonsnalcolor.model.StoreType; +import com.pyonsnalcolor.repository.PbProductRepository; +import com.pyonsnalcolor.service.PbBatchService; import lombok.extern.slf4j.Slf4j; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -17,7 +17,7 @@ import java.util.Collections; import java.util.List; -import static com.pyonsnalcolor.batch.model.UUIDGenerator.generateId; +import static com.pyonsnalcolor.model.UUIDGenerator.generateId; @Service("Emart24Pb") @Slf4j diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/gs25/GS25Constant.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/gs25/GS25Constant.java similarity index 72% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/gs25/GS25Constant.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/gs25/GS25Constant.java index ee0e35c..83f9848 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/gs25/GS25Constant.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/gs25/GS25Constant.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.service.gs25; +package com.pyonsnalcolor.service.gs25; public class GS25Constant { public static final String GS_MAIN_PAGE_URL = "http://gs25.gsretail.com/gscvs/ko/main"; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/gs25/GS25EventBatchService.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/gs25/GS25EventBatchService.java similarity index 89% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/gs25/GS25EventBatchService.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/gs25/GS25EventBatchService.java index d565374..cd5b0e7 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/gs25/GS25EventBatchService.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/gs25/GS25EventBatchService.java @@ -1,14 +1,14 @@ -package com.pyonsnalcolor.batch.service.gs25; +package com.pyonsnalcolor.service.gs25; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.pyonsnalcolor.batch.client.GS25Client; -import com.pyonsnalcolor.batch.client.GS25EventRequestBody; -import com.pyonsnalcolor.batch.model.BaseEventProduct; -import com.pyonsnalcolor.batch.model.EventType; -import com.pyonsnalcolor.batch.model.StoreType; -import com.pyonsnalcolor.batch.repository.EventProductRepository; -import com.pyonsnalcolor.batch.service.EventBatchService; +import com.pyonsnalcolor.client.GS25Client; +import com.pyonsnalcolor.client.GS25EventRequestBody; +import com.pyonsnalcolor.model.BaseEventProduct; +import com.pyonsnalcolor.model.EventType; +import com.pyonsnalcolor.model.StoreType; +import com.pyonsnalcolor.repository.EventProductRepository; +import com.pyonsnalcolor.service.EventBatchService; import lombok.extern.slf4j.Slf4j; import org.jsoup.Connection; import org.jsoup.Jsoup; @@ -23,8 +23,8 @@ import java.util.List; import java.util.Map; -import static com.pyonsnalcolor.batch.model.UUIDGenerator.generateId; -import static com.pyonsnalcolor.batch.service.gs25.GS25Constant.GS_MAIN_PAGE_URL; +import static com.pyonsnalcolor.model.UUIDGenerator.generateId; +import static com.pyonsnalcolor.service.gs25.GS25Constant.GS_MAIN_PAGE_URL; @Service("GS25Event") diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/gs25/GS25PbBatchService.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/gs25/GS25PbBatchService.java similarity index 89% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/gs25/GS25PbBatchService.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/gs25/GS25PbBatchService.java index 4cb4945..69429a9 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/gs25/GS25PbBatchService.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/gs25/GS25PbBatchService.java @@ -1,13 +1,13 @@ -package com.pyonsnalcolor.batch.service.gs25; +package com.pyonsnalcolor.service.gs25; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.pyonsnalcolor.batch.client.GS25Client; -import com.pyonsnalcolor.batch.client.GS25PbRequestBody; -import com.pyonsnalcolor.batch.model.BasePbProduct; -import com.pyonsnalcolor.batch.model.StoreType; -import com.pyonsnalcolor.batch.repository.PbProductRepository; -import com.pyonsnalcolor.batch.service.PbBatchService; +import com.pyonsnalcolor.client.GS25Client; +import com.pyonsnalcolor.client.GS25PbRequestBody; +import com.pyonsnalcolor.model.BasePbProduct; +import com.pyonsnalcolor.model.StoreType; +import com.pyonsnalcolor.repository.PbProductRepository; +import com.pyonsnalcolor.service.PbBatchService; import lombok.extern.slf4j.Slf4j; import org.jsoup.Connection; import org.jsoup.Jsoup; @@ -19,12 +19,11 @@ import java.io.IOException; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; -import static com.pyonsnalcolor.batch.model.UUIDGenerator.generateId; -import static com.pyonsnalcolor.batch.service.gs25.GS25Constant.GS_MAIN_PAGE_URL; +import static com.pyonsnalcolor.model.UUIDGenerator.generateId; +import static com.pyonsnalcolor.service.gs25.GS25Constant.GS_MAIN_PAGE_URL; @Service("GS25Pb") diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/seven/SevenEventBatchService.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/seven/SevenEventBatchService.java similarity index 92% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/seven/SevenEventBatchService.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/seven/SevenEventBatchService.java index 1cd42b7..1bf6a2e 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/seven/SevenEventBatchService.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/seven/SevenEventBatchService.java @@ -1,8 +1,8 @@ -package com.pyonsnalcolor.batch.service.seven; +package com.pyonsnalcolor.service.seven; -import com.pyonsnalcolor.batch.model.BaseEventProduct; -import com.pyonsnalcolor.batch.repository.EventProductRepository; -import com.pyonsnalcolor.batch.service.EventBatchService; +import com.pyonsnalcolor.model.BaseEventProduct; +import com.pyonsnalcolor.repository.EventProductRepository; +import com.pyonsnalcolor.service.EventBatchService; import lombok.extern.slf4j.Slf4j; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/seven/SevenEventTab.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/seven/SevenEventTab.java similarity index 94% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/seven/SevenEventTab.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/seven/SevenEventTab.java index b3b36ba..c1ac09c 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/seven/SevenEventTab.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/seven/SevenEventTab.java @@ -1,8 +1,8 @@ -package com.pyonsnalcolor.batch.service.seven; +package com.pyonsnalcolor.service.seven; -import com.pyonsnalcolor.batch.model.BaseEventProduct; -import com.pyonsnalcolor.batch.model.EventType; -import com.pyonsnalcolor.batch.model.StoreType; +import com.pyonsnalcolor.model.BaseEventProduct; +import com.pyonsnalcolor.model.EventType; +import com.pyonsnalcolor.model.StoreType; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.jsoup.Jsoup; @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import static com.pyonsnalcolor.batch.model.UUIDGenerator.generateId; +import static com.pyonsnalcolor.model.UUIDGenerator.generateId; @Slf4j public enum SevenEventTab { diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/seven/SevenPbBatchService.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/seven/SevenPbBatchService.java similarity index 91% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/seven/SevenPbBatchService.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/seven/SevenPbBatchService.java index 883fbd7..d2c11c4 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/service/seven/SevenPbBatchService.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/service/seven/SevenPbBatchService.java @@ -1,9 +1,9 @@ -package com.pyonsnalcolor.batch.service.seven; +package com.pyonsnalcolor.service.seven; -import com.pyonsnalcolor.batch.model.BasePbProduct; -import com.pyonsnalcolor.batch.model.StoreType; -import com.pyonsnalcolor.batch.repository.PbProductRepository; -import com.pyonsnalcolor.batch.service.PbBatchService; +import com.pyonsnalcolor.model.BasePbProduct; +import com.pyonsnalcolor.model.StoreType; +import com.pyonsnalcolor.repository.PbProductRepository; +import com.pyonsnalcolor.service.PbBatchService; import lombok.extern.slf4j.Slf4j; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/util/Mapper.java b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/util/Mapper.java similarity index 88% rename from pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/util/Mapper.java rename to pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/util/Mapper.java index 07bd5ca..66ba006 100644 --- a/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/batch/util/Mapper.java +++ b/pyonsnalcolor-batch/src/main/java/com/pyonsnalcolor/util/Mapper.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.batch.util; +package com.pyonsnalcolor.util; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.context.annotation.Bean; diff --git a/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/batch/repository/PbProductRepositoryTest.java b/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/batch/repository/PbProductRepositoryTest.java deleted file mode 100644 index cca319d..0000000 --- a/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/batch/repository/PbProductRepositoryTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.pyonsnalcolor.batch.repository; - -class PbProductRepositoryTest { -} diff --git a/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/repository/PbProductRepositoryTest.java b/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/repository/PbProductRepositoryTest.java new file mode 100644 index 0000000..1baad1a --- /dev/null +++ b/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/repository/PbProductRepositoryTest.java @@ -0,0 +1,4 @@ +package com.pyonsnalcolor.repository; + +class PbProductRepositoryTest { +} diff --git a/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/batch/service/emart24/Emart24EventBatchServiceTest.java b/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/service/emart24/Emart24EventBatchServiceTest.java similarity index 78% rename from pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/batch/service/emart24/Emart24EventBatchServiceTest.java rename to pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/service/emart24/Emart24EventBatchServiceTest.java index 071f03d..e01e9c5 100644 --- a/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/batch/service/emart24/Emart24EventBatchServiceTest.java +++ b/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/service/emart24/Emart24EventBatchServiceTest.java @@ -1,10 +1,10 @@ -package com.pyonsnalcolor.batch.service.emart24; +package com.pyonsnalcolor.service.emart24; -import com.pyonsnalcolor.batch.model.BaseEventProduct; -import com.pyonsnalcolor.batch.model.EventType; -import com.pyonsnalcolor.batch.model.StoreType; -import com.pyonsnalcolor.batch.repository.EventProductRepository; -import com.pyonsnalcolor.batch.service.BatchService; +import com.pyonsnalcolor.model.BaseEventProduct; +import com.pyonsnalcolor.model.EventType; +import com.pyonsnalcolor.model.StoreType; +import com.pyonsnalcolor.repository.EventProductRepository; +import com.pyonsnalcolor.service.BatchService; import org.assertj.core.api.Assertions; import org.junit.Ignore; import org.junit.jupiter.api.DisplayName; @@ -14,9 +14,8 @@ import org.springframework.boot.test.context.SpringBootTest; import java.time.LocalDateTime; -import java.util.Optional; -import static com.pyonsnalcolor.batch.model.UUIDGenerator.generateId; +import static com.pyonsnalcolor.model.UUIDGenerator.generateId; @SpringBootTest class Emart24EventBatchServiceTest { diff --git a/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/batch/service/emart24/Emart24PbBatchServiceTest.java b/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/service/emart24/Emart24PbBatchServiceTest.java similarity index 84% rename from pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/batch/service/emart24/Emart24PbBatchServiceTest.java rename to pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/service/emart24/Emart24PbBatchServiceTest.java index b2fb6f4..09225a3 100644 --- a/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/batch/service/emart24/Emart24PbBatchServiceTest.java +++ b/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/service/emart24/Emart24PbBatchServiceTest.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.batch.service.emart24; +package com.pyonsnalcolor.service.emart24; -import com.pyonsnalcolor.batch.service.BatchService; +import com.pyonsnalcolor.service.BatchService; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/batch/service/gs25/GS25EventBatchServiceTest.java b/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/service/gs25/GS25EventBatchServiceTest.java similarity index 84% rename from pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/batch/service/gs25/GS25EventBatchServiceTest.java rename to pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/service/gs25/GS25EventBatchServiceTest.java index 6ff61ed..9c7f6e7 100644 --- a/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/batch/service/gs25/GS25EventBatchServiceTest.java +++ b/pyonsnalcolor-batch/src/test/java/com/pyonsnalcolor/service/gs25/GS25EventBatchServiceTest.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.batch.service.gs25; +package com.pyonsnalcolor.service.gs25; -import com.pyonsnalcolor.batch.service.BatchService; +import com.pyonsnalcolor.service.BatchService; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/pyonsnalcolor-batch/target/classes/com/pyonsnalcolor/batch/BatchApplication.class b/pyonsnalcolor-batch/target/classes/com/pyonsnalcolor/batch/BatchApplication.class deleted file mode 100644 index 2f02c5e..0000000 Binary files a/pyonsnalcolor-batch/target/classes/com/pyonsnalcolor/batch/BatchApplication.class and /dev/null differ diff --git a/pyonsnalcolor-batch/target/test-classes/com/pyonsnalcolor/BatchApplicationTests.class b/pyonsnalcolor-batch/target/test-classes/com/pyonsnalcolor/BatchApplicationTests.class deleted file mode 100644 index f556aa0..0000000 Binary files a/pyonsnalcolor-batch/target/test-classes/com/pyonsnalcolor/BatchApplicationTests.class and /dev/null differ diff --git a/pyonsnalcolor-batch/target/test-classes/com/pyonsnalcolor/batch/BatchApplicationTests.class b/pyonsnalcolor-batch/target/test-classes/com/pyonsnalcolor/batch/BatchApplicationTests.class deleted file mode 100644 index 49ed35a..0000000 Binary files a/pyonsnalcolor-batch/target/test-classes/com/pyonsnalcolor/batch/BatchApplicationTests.class and /dev/null differ diff --git a/pyonsnalcolor-domain/build.gradle b/pyonsnalcolor-domain/build.gradle new file mode 100644 index 0000000..8eab0ba --- /dev/null +++ b/pyonsnalcolor-domain/build.gradle @@ -0,0 +1,24 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.pyonsnalcolor.java-conventions' +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa:2.7.12' + implementation 'javax.validation:validation-api:2.0.1.Final' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-data-mongodb:2.7.12' + runtimeOnly 'com.mysql:mysql-connector-j:8.0.33' +} + +description = 'pyonsnalcolor-domain' + +jar { + enabled = true +} +bootJar { + enabled = false +} \ No newline at end of file diff --git a/pyonsnalcolor-domain/build/resources/main/application.yml b/pyonsnalcolor-domain/build/resources/main/application.yml new file mode 100644 index 0000000..f391080 --- /dev/null +++ b/pyonsnalcolor-domain/build/resources/main/application.yml @@ -0,0 +1,18 @@ +spring: + server: + address: localhost + port: 8081 + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + data: + mongodb: + uri: mongodb://localhost:27017/pyonsnal + jpa: + database: mysql + database-platform: org.hibernate.dialect.MySQL8Dialect + hibernate: + ddl-auto: create + show-sql: true \ No newline at end of file diff --git a/pyonsnalcolor-domain/pom.xml b/pyonsnalcolor-domain/pom.xml deleted file mode 100644 index d8ed1a9..0000000 --- a/pyonsnalcolor-domain/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - pyonsnalcolor - com.pyonsnalcolor - 1.0-SNAPSHOT - - 4.0.0 - com.pyonsnalcolor - pyonsnalcolor-domain - 1.0-SNAPSHOT - pyonsnalcolor-domain - Demo project for Spring Boot - - - 11 - 11 - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - com.mysql - mysql-connector-j - runtime - - - - javax.validation - validation-api - 2.0.1.Final - - - - org.springframework.boot - spring-boot-starter-validation - 3.1.0 - - - org.springframework.boot - spring-boot-starter-data-mongodb - - - \ No newline at end of file diff --git a/pyonsnalcolor-domain/pyonsnalcolor-domain.iml b/pyonsnalcolor-domain/pyonsnalcolor-domain.iml deleted file mode 100644 index 7fbfa23..0000000 --- a/pyonsnalcolor-domain/pyonsnalcolor-domain.iml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/PushKeyword.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/PushKeyword.java similarity index 86% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/PushKeyword.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/PushKeyword.java index 7c208f2..e08ee14 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/PushKeyword.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/PushKeyword.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.domain.alarm; +package com.pyonsnalcolor.alarm; -import com.pyonsnalcolor.domain.member.Member; +import com.pyonsnalcolor.member.Member; import lombok.*; import javax.persistence.*; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/PushProductStore.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/PushProductStore.java similarity index 84% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/PushProductStore.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/PushProductStore.java index 7f45d44..e3fb1ec 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/PushProductStore.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/PushProductStore.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.domain.alarm; +package com.pyonsnalcolor.alarm; -import com.pyonsnalcolor.domain.product.enumtype.ProductStoreType; -import com.pyonsnalcolor.domain.member.Member; +import com.pyonsnalcolor.product.enumtype.ProductStoreType; +import com.pyonsnalcolor.member.Member; import lombok.*; import org.hibernate.annotations.ColumnDefault; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/PushRecord.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/PushRecord.java similarity index 80% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/PushRecord.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/PushRecord.java index 772d19a..59c4b60 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/PushRecord.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/PushRecord.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.domain.alarm; +package com.pyonsnalcolor.alarm; -import com.pyonsnalcolor.domain.member.Member; -import com.pyonsnalcolor.domain.product.enumtype.StoreType; +import com.pyonsnalcolor.member.Member; +import com.pyonsnalcolor.product.enumtype.StoreType; import lombok.*; import javax.persistence.*; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/repository/PushKeywordRepository.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/repository/PushKeywordRepository.java similarity index 67% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/repository/PushKeywordRepository.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/repository/PushKeywordRepository.java index 72dcd0b..120798a 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/repository/PushKeywordRepository.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/repository/PushKeywordRepository.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.domain.alarm.repository; +package com.pyonsnalcolor.alarm.repository; -import com.pyonsnalcolor.domain.alarm.PushKeyword; +import com.pyonsnalcolor.alarm.PushKeyword; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/repository/PushProductStoreRepository.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/repository/PushProductStoreRepository.java similarity index 67% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/repository/PushProductStoreRepository.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/repository/PushProductStoreRepository.java index 59d8fb0..94f4c43 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/repository/PushProductStoreRepository.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/repository/PushProductStoreRepository.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.domain.alarm.repository; +package com.pyonsnalcolor.alarm.repository; -import com.pyonsnalcolor.domain.alarm.PushProductStore; +import com.pyonsnalcolor.alarm.PushProductStore; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/repository/PushRecordRepository.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/repository/PushRecordRepository.java similarity index 67% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/repository/PushRecordRepository.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/repository/PushRecordRepository.java index 9cd9b45..bd4472e 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/alarm/repository/PushRecordRepository.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/alarm/repository/PushRecordRepository.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.domain.alarm.repository; +package com.pyonsnalcolor.alarm.repository; -import com.pyonsnalcolor.domain.alarm.PushRecord; +import com.pyonsnalcolor.alarm.PushRecord; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/enumtype/ProductType.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/enumtype/ProductType.java deleted file mode 100644 index b081d45..0000000 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/enumtype/ProductType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.pyonsnalcolor.domain.product.enumtype; - -public enum ProductType { - PB, EVENT; -} diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/Member.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/Member.java similarity index 77% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/Member.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/Member.java index 969f62b..7bebca9 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/Member.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/Member.java @@ -1,11 +1,10 @@ -package com.pyonsnalcolor.domain.member; - -import com.pyonsnalcolor.domain.alarm.PushProductStore; -import com.pyonsnalcolor.domain.alarm.PushKeyword; -import com.pyonsnalcolor.domain.alarm.PushRecord; -import com.pyonsnalcolor.domain.member.enumtype.Nickname; -import com.pyonsnalcolor.domain.member.enumtype.OAuthType; -import com.pyonsnalcolor.domain.member.enumtype.Role; +package com.pyonsnalcolor.member; + +import com.pyonsnalcolor.alarm.PushProductStore; +import com.pyonsnalcolor.alarm.PushKeyword; +import com.pyonsnalcolor.alarm.PushRecord; +import com.pyonsnalcolor.member.enumtype.OAuthType; +import com.pyonsnalcolor.member.enumtype.Role; import lombok.*; import javax.persistence.*; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/MemberRepository.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/MemberRepository.java similarity index 87% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/MemberRepository.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/MemberRepository.java index 7eb83f3..7ad22b3 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/MemberRepository.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/MemberRepository.java @@ -1,6 +1,5 @@ -package com.pyonsnalcolor.domain.member; +package com.pyonsnalcolor.member; -import com.pyonsnalcolor.domain.member.Member; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/enumtype/Nickname.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/enumtype/Nickname.java similarity index 97% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/enumtype/Nickname.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/enumtype/Nickname.java index 5b06eaf..068614a 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/enumtype/Nickname.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/enumtype/Nickname.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.domain.member.enumtype; +package com.pyonsnalcolor.member.enumtype; import lombok.Getter; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/enumtype/OAuthType.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/enumtype/OAuthType.java similarity index 84% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/enumtype/OAuthType.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/enumtype/OAuthType.java index 4b3f968..181a5f2 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/enumtype/OAuthType.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/enumtype/OAuthType.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.domain.member.enumtype; +package com.pyonsnalcolor.member.enumtype; public enum OAuthType { APPLE("apple-"), KAKAO("kakao-"); diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/enumtype/Role.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/enumtype/Role.java similarity index 54% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/enumtype/Role.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/enumtype/Role.java index 908860f..6ad8519 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/member/enumtype/Role.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/member/enumtype/Role.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.domain.member.enumtype; +package com.pyonsnalcolor.member.enumtype; public enum Role { ROLE_USER, ROLE_GUEST, ROLE_ADMIN; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/BaseEventProduct.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/BaseEventProduct.java similarity index 81% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/BaseEventProduct.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/BaseEventProduct.java index a3bced9..523389e 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/BaseEventProduct.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/BaseEventProduct.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.domain.product; +package com.pyonsnalcolor.product; -import com.pyonsnalcolor.domain.product.enumtype.EventType; +import com.pyonsnalcolor.product.enumtype.EventType; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/BasePbProduct.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/BasePbProduct.java similarity index 89% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/BasePbProduct.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/BasePbProduct.java index 2c7f1bd..e84b610 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/BasePbProduct.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/BasePbProduct.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.product.model; +package com.pyonsnalcolor.product; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/BaseProduct.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/BaseProduct.java similarity index 84% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/BaseProduct.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/BaseProduct.java index 376d722..158114a 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/BaseProduct.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/BaseProduct.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.domain.product; +package com.pyonsnalcolor.product; -import com.pyonsnalcolor.domain.product.enumtype.StoreType; +import com.pyonsnalcolor.product.enumtype.StoreType; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/DatabaseSequence.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/DatabaseSequence.java similarity index 86% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/DatabaseSequence.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/DatabaseSequence.java index 9fcd80b..6ee14a2 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/DatabaseSequence.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/DatabaseSequence.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.domain.product; +package com.pyonsnalcolor.product; import lombok.Getter; import org.springframework.data.annotation.Id; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/UUIDGenerator.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/UUIDGenerator.java similarity index 79% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/UUIDGenerator.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/UUIDGenerator.java index 3b2121e..1c61c64 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/UUIDGenerator.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/UUIDGenerator.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.domain.product; +package com.pyonsnalcolor.product; import java.util.UUID; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/enumtype/EventType.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/enumtype/EventType.java similarity index 90% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/enumtype/EventType.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/enumtype/EventType.java index 7e1c90a..f8f2bc5 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/enumtype/EventType.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/enumtype/EventType.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.domain.product.enumtype; +package com.pyonsnalcolor.product.enumtype; import lombok.Getter; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/enumtype/ProductStoreType.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/enumtype/ProductStoreType.java similarity index 74% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/enumtype/ProductStoreType.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/enumtype/ProductStoreType.java index fe73de8..f98a27d 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/enumtype/ProductStoreType.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/enumtype/ProductStoreType.java @@ -1,9 +1,9 @@ -package com.pyonsnalcolor.domain.product.enumtype; +package com.pyonsnalcolor.product.enumtype; import lombok.Getter; -import static com.pyonsnalcolor.domain.product.enumtype.ProductType.*; -import static com.pyonsnalcolor.domain.product.enumtype.StoreType.*; +import static com.pyonsnalcolor.product.enumtype.ProductType.*; +import static com.pyonsnalcolor.product.enumtype.StoreType.*; @Getter public enum ProductStoreType { diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/enumtype/ProductType.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/enumtype/ProductType.java new file mode 100644 index 0000000..53ee843 --- /dev/null +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/enumtype/ProductType.java @@ -0,0 +1,5 @@ +package com.pyonsnalcolor.product.enumtype; + +public enum ProductType { + PB, EVENT; +} diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/enumtype/StoreType.java b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/enumtype/StoreType.java similarity index 64% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/enumtype/StoreType.java rename to pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/enumtype/StoreType.java index c89247a..b41c741 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/enumtype/StoreType.java +++ b/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/product/enumtype/StoreType.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.domain.product.enumtype; +package com.pyonsnalcolor.product.enumtype; import lombok.Getter; diff --git a/pyonsnalcolor-member/.mvn/wrapper/maven-wrapper.jar b/pyonsnalcolor-member/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index bf82ff0..0000000 Binary files a/pyonsnalcolor-member/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/pyonsnalcolor-member/.mvn/wrapper/maven-wrapper.properties b/pyonsnalcolor-member/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index ca5ab4b..0000000 --- a/pyonsnalcolor-member/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/pyonsnalcolor-member/HELP.md b/pyonsnalcolor-member/HELP.md deleted file mode 100644 index 16b0b13..0000000 --- a/pyonsnalcolor-member/HELP.md +++ /dev/null @@ -1,31 +0,0 @@ -# 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.7.12/maven-plugin/reference/html/) -* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.7.12/maven-plugin/reference/html/#build-image) -* [Spring Batch](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#howto.batch) -* [Spring Web](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#web) -* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#data.sql.jpa-and-spring-data) -* [Spring Data MongoDB](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#data.nosql.mongodb) -* [Spring Boot DevTools](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#using.devtools) -* [OpenFeign](https://docs.spring.io/spring-cloud-openfeign/docs/current/reference/html/) - -### Guides -The following guides illustrate how to use some features concretely: - -* [Creating a Batch Service](https://spring.io/guides/gs/batch-processing/) -* [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/rest/) -* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) -* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) -* [Accessing Data with MongoDB](https://spring.io/guides/gs/accessing-data-mongodb/) - -### Additional Links -These additional references should also help you: - -* [Declarative REST calls with Spring Cloud OpenFeign sample](https://github.com/spring-cloud-samples/feign-eureka) - diff --git a/pyonsnalcolor-member/build.gradle b/pyonsnalcolor-member/build.gradle new file mode 100644 index 0000000..494f2a9 --- /dev/null +++ b/pyonsnalcolor-member/build.gradle @@ -0,0 +1,31 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.pyonsnalcolor.java-conventions' +} + +dependencies { + implementation project(':pyonsnalcolor-domain') + api 'org.springframework.boot:spring-boot-starter-data-jpa:2.7.12' + api 'org.springframework.boot:spring-boot-starter-validation' + + implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:3.1.7' + implementation 'org.springframework.security:spring-security-core:5.5.0' + implementation 'org.springframework.security.oauth:spring-security-oauth2:2.5.2.RELEASE' + implementation 'org.springframework.security:spring-security-config:5.5.0' + + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + implementation 'com.google.code.gson:gson:2.10.1' + implementation 'org.springframework.boot:spring-boot-starter-data-redis:2.7.4' + + implementation 'io.lettuce:lettuce-core:6.2.4.RELEASE' + + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' + + testImplementation 'junit:junit:4.13.2' +} + +description = 'pyonsnalcolor-member' diff --git a/pyonsnalcolor-member/build/resources/main/application-oauth.yml b/pyonsnalcolor-member/build/resources/main/application-oauth.yml new file mode 100644 index 0000000..cb0a9dd --- /dev/null +++ b/pyonsnalcolor-member/build/resources/main/application-oauth.yml @@ -0,0 +1,9 @@ +spring: + security: + oauth2: + kakao: + request-uri: ${KAKAO_REQUEST_URI} + apple: + key-uri: ${APPLE_KEY_URI} + issuer: ${APPLE_ISSUER} + client-id: ${APPLE_CLIENT_ID} \ No newline at end of file diff --git a/pyonsnalcolor-member/build/resources/main/application.yml b/pyonsnalcolor-member/build/resources/main/application.yml new file mode 100644 index 0000000..2425223 --- /dev/null +++ b/pyonsnalcolor-member/build/resources/main/application.yml @@ -0,0 +1,43 @@ +spring: + config: + import: + - optional:classpath:/application-oauth.yml + server: + address: localhost + port: 8080 + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + mvc: + pathmatch: + matching-strategy: ant_path_matcher + redis: + host: localhost + port: 6379 + jpa: + database: mysql + database-platform: org.hibernate.dialect.MySQL8Dialect + hibernate: + ddl-auto: create + show-sql: true + properties: + hibernate: + format_sql: true + defer-datasource-initialization: true + sql: + init: + mode: always + encoding: UTF-8 +jwt: + issuer: ${JWT_ISSUER} + secret: ${JWT_SECRET} + bearer: + header: ${JWT_BEARER_HEADER} + access-token: + header: ${JWT_ACCESS_TOKEN_HEADER} + validity: ${JWT_ACCESS_TOKEN_VALIDITY} + refresh-token: + header: ${JWT_REFRESH_TOKEN_HEADER} + validity: ${JWT_REFRESH_TOKEN_VALIDITY} diff --git a/pyonsnalcolor-member/mvnw b/pyonsnalcolor-member/mvnw deleted file mode 100644 index 8a8fb22..0000000 --- a/pyonsnalcolor-member/mvnw +++ /dev/null @@ -1,316 +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 /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - 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="`\\unset -f command; \\command -v 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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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" || rm -f "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$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 \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/pyonsnalcolor-member/mvnw.cmd b/pyonsnalcolor-member/mvnw.cmd deleted file mode 100644 index 1d8ab01..0000000 --- a/pyonsnalcolor-member/mvnw.cmd +++ /dev/null @@ -1,188 +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 "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - -FOR /F "usebackq 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%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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 "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\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% - -cmd /C exit /B %ERROR_CODE% diff --git a/pyonsnalcolor-member/pom.xml b/pyonsnalcolor-member/pom.xml deleted file mode 100644 index 222336e..0000000 --- a/pyonsnalcolor-member/pom.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - 4.0.0 - - pyonsnalcolor - com.pyonsnalcolor - 1.0-SNAPSHOT - - com.pyonsnalcolor - pyonsnalcolor-member - 1.0-SNAPSHOT - pyonsnalcolor-member - Demo project for Spring Boot - - 11 - 2021.0.7 - - - - - com.pyonsnalcolor - pyonsnalcolor-domain - 1.0-SNAPSHOT - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - org.springframework.security - spring-security-core - 5.5.0 - - - - org.springframework.security.oauth - spring-security-oauth2 - 2.5.2.RELEASE - - - - org.springframework.security - spring-security-config - 5.5.0 - - - - io.jsonwebtoken - jjwt-api - 0.11.5 - - - - io.jsonwebtoken - jjwt-impl - 0.11.5 - runtime - - - - io.jsonwebtoken - jjwt-jackson - 0.11.5 - runtime - - - com.google.code.gson - gson - 2.10.1 - - - - org.springframework.boot - spring-boot-starter-data-redis - 2.7.4 - - - - io.lettuce - lettuce-core - 6.2.4.RELEASE - - - junit - junit - test - - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - ${java.version} - ${java.version} - ${java.version} - - - - - diff --git a/pyonsnalcolor-member/pyonsnalcolor-member.iml b/pyonsnalcolor-member/pyonsnalcolor-member.iml deleted file mode 100644 index ac634cd..0000000 --- a/pyonsnalcolor-member/pyonsnalcolor-member.iml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/MemberApplication.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/MemberApplication.java new file mode 100644 index 0000000..85217c3 --- /dev/null +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/MemberApplication.java @@ -0,0 +1,12 @@ +package com.pyonsnalcolor; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class MemberApplication { + + public static void main(String[] args) { + SpringApplication.run(MemberApplication.class, args); + } +} \ No newline at end of file diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/CustomUserDetails.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/CustomUserDetails.java similarity index 93% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/CustomUserDetails.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/CustomUserDetails.java index 7ef46d3..95dea64 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/CustomUserDetails.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/CustomUserDetails.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.member.auth; +package com.pyonsnalcolor.auth; -import com.pyonsnalcolor.domain.member.Member; +import com.pyonsnalcolor.member.Member; import lombok.RequiredArgsConstructor; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/CustomUserDetailsService.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/CustomUserDetailsService.java similarity index 84% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/CustomUserDetailsService.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/CustomUserDetailsService.java index e933501..48058cb 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/CustomUserDetailsService.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/CustomUserDetailsService.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.member.auth; +package com.pyonsnalcolor.auth; -import com.pyonsnalcolor.domain.member.Member; -import com.pyonsnalcolor.domain.member.MemberRepository; +import com.pyonsnalcolor.member.Member; +import com.pyonsnalcolor.member.MemberRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/RedisUtil.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/RedisUtil.java similarity index 95% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/RedisUtil.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/RedisUtil.java index efade6b..4c5d97a 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/RedisUtil.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/RedisUtil.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.member.auth; +package com.pyonsnalcolor.auth; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/controller/AuthController.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/controller/AuthController.java similarity index 68% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/controller/AuthController.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/controller/AuthController.java index d74649f..a580a72 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/controller/AuthController.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/controller/AuthController.java @@ -1,19 +1,16 @@ -package com.pyonsnalcolor.member.auth.controller; +package com.pyonsnalcolor.auth.controller; -import com.pyonsnalcolor.domain.member.enumtype.OAuthType; -import com.pyonsnalcolor.member.auth.dto.LoginRequestDto; -import com.pyonsnalcolor.member.auth.dto.TokenDto; -import com.pyonsnalcolor.member.auth.oauth.apple.AppleOauthService; -import com.pyonsnalcolor.member.auth.oauth.kakao.KakaoOauthService; -import com.pyonsnalcolor.member.auth.service.MemberService; +import com.pyonsnalcolor.member.enumtype.OAuthType; +import com.pyonsnalcolor.auth.dto.LoginRequestDto; +import com.pyonsnalcolor.auth.dto.TokenDto; +import com.pyonsnalcolor.auth.oauth.apple.AppleOauthService; +import com.pyonsnalcolor.auth.oauth.kakao.KakaoOauthService; +import com.pyonsnalcolor.auth.service.MemberService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @Slf4j @RestController @@ -50,4 +47,9 @@ public ResponseEntity reissueAccessToken( TokenDto newTokenDto = memberService.reissueAccessToken(tokenDto); return new ResponseEntity(newTokenDto, HttpStatus.OK); } + + @GetMapping("/test") + public ResponseEntity test() { + return new ResponseEntity("Welcome to Pyonsnal Color", HttpStatus.OK); + } } \ No newline at end of file diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/controller/MemberController.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/controller/MemberController.java similarity index 83% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/controller/MemberController.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/controller/MemberController.java index 3b068b9..bba9fc8 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/controller/MemberController.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/controller/MemberController.java @@ -1,10 +1,10 @@ -package com.pyonsnalcolor.member.auth.controller; +package com.pyonsnalcolor.auth.controller; -import com.pyonsnalcolor.member.auth.dto.MemberInfoResponseDto; -import com.pyonsnalcolor.member.auth.dto.NicknameRequestDto; -import com.pyonsnalcolor.member.auth.dto.TokenDto; -import com.pyonsnalcolor.member.auth.CustomUserDetails; -import com.pyonsnalcolor.member.auth.service.MemberService; +import com.pyonsnalcolor.auth.dto.MemberInfoResponseDto; +import com.pyonsnalcolor.auth.dto.NicknameRequestDto; +import com.pyonsnalcolor.auth.dto.TokenDto; +import com.pyonsnalcolor.auth.CustomUserDetails; +import com.pyonsnalcolor.auth.service.MemberService; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/dto/LoginRequestDto.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/dto/LoginRequestDto.java similarity index 76% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/dto/LoginRequestDto.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/dto/LoginRequestDto.java index d983491..bc14c83 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/dto/LoginRequestDto.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/dto/LoginRequestDto.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.member.auth.dto; +package com.pyonsnalcolor.auth.dto; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/dto/MemberInfoResponseDto.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/dto/MemberInfoResponseDto.java similarity index 84% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/dto/MemberInfoResponseDto.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/dto/MemberInfoResponseDto.java index 11088c2..2b4cca5 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/dto/MemberInfoResponseDto.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/dto/MemberInfoResponseDto.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.member.auth.dto; +package com.pyonsnalcolor.auth.dto; -import com.pyonsnalcolor.domain.member.Member; +import com.pyonsnalcolor.member.Member; import lombok.Getter; @Getter diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/dto/NicknameRequestDto.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/dto/NicknameRequestDto.java similarity index 90% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/dto/NicknameRequestDto.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/dto/NicknameRequestDto.java index 8516efb..171a60b 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/dto/NicknameRequestDto.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/dto/NicknameRequestDto.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.member.auth.dto; +package com.pyonsnalcolor.auth.dto; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/dto/TokenDto.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/dto/TokenDto.java similarity index 79% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/dto/TokenDto.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/dto/TokenDto.java index 9e378ee..c479adb 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/dto/TokenDto.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/dto/TokenDto.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.member.auth.dto; +package com.pyonsnalcolor.auth.dto; import lombok.*; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/jwt/JwtAuthenticationFilter.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/jwt/JwtAuthenticationFilter.java similarity index 93% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/jwt/JwtAuthenticationFilter.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/jwt/JwtAuthenticationFilter.java index 0518857..1c2a5b2 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/jwt/JwtAuthenticationFilter.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/jwt/JwtAuthenticationFilter.java @@ -1,8 +1,8 @@ -package com.pyonsnalcolor.member.auth.jwt; +package com.pyonsnalcolor.auth.jwt; -import com.pyonsnalcolor.member.auth.CustomUserDetails; -import com.pyonsnalcolor.member.auth.CustomUserDetailsService; -import com.pyonsnalcolor.member.auth.RedisUtil; +import com.pyonsnalcolor.auth.CustomUserDetails; +import com.pyonsnalcolor.auth.CustomUserDetailsService; +import com.pyonsnalcolor.auth.RedisUtil; import io.jsonwebtoken.JwtException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/jwt/JwtTokenProvider.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/jwt/JwtTokenProvider.java similarity index 97% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/jwt/JwtTokenProvider.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/jwt/JwtTokenProvider.java index 852c739..f3268cb 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/jwt/JwtTokenProvider.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/jwt/JwtTokenProvider.java @@ -1,6 +1,6 @@ -package com.pyonsnalcolor.member.auth.jwt; +package com.pyonsnalcolor.auth.jwt; -import com.pyonsnalcolor.member.auth.dto.TokenDto; +import com.pyonsnalcolor.auth.dto.TokenDto; import io.jsonwebtoken.*; import io.jsonwebtoken.security.Keys; import lombok.extern.slf4j.Slf4j; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/apple/AppleOauthService.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/apple/AppleOauthService.java similarity index 94% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/apple/AppleOauthService.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/apple/AppleOauthService.java index 1828b5c..8a17a82 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/apple/AppleOauthService.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/apple/AppleOauthService.java @@ -1,10 +1,10 @@ -package com.pyonsnalcolor.member.auth.oauth.apple; +package com.pyonsnalcolor.auth.oauth.apple; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.pyonsnalcolor.member.auth.dto.LoginRequestDto; -import com.pyonsnalcolor.member.auth.oauth.apple.dto.ApplePublicKeyDto; -import com.pyonsnalcolor.member.auth.oauth.apple.dto.ApplePublicKeysDto; +import com.pyonsnalcolor.auth.dto.LoginRequestDto; +import com.pyonsnalcolor.auth.oauth.apple.dto.ApplePublicKeyDto; +import com.pyonsnalcolor.auth.oauth.apple.dto.ApplePublicKeysDto; import io.jsonwebtoken.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/apple/dto/ApplePublicKeyDto.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/apple/dto/ApplePublicKeyDto.java similarity index 79% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/apple/dto/ApplePublicKeyDto.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/apple/dto/ApplePublicKeyDto.java index 36af863..1d47eb2 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/apple/dto/ApplePublicKeyDto.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/apple/dto/ApplePublicKeyDto.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.member.auth.oauth.apple.dto; +package com.pyonsnalcolor.auth.oauth.apple.dto; import lombok.Getter; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/apple/dto/ApplePublicKeysDto.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/apple/dto/ApplePublicKeysDto.java similarity index 91% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/apple/dto/ApplePublicKeysDto.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/apple/dto/ApplePublicKeysDto.java index c8cdbca..1dbf66d 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/apple/dto/ApplePublicKeysDto.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/apple/dto/ApplePublicKeysDto.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.member.auth.oauth.apple.dto; +package com.pyonsnalcolor.auth.oauth.apple.dto; import lombok.Getter; import java.util.List; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/kakao/KakaoOauthService.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/kakao/KakaoOauthService.java similarity index 89% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/kakao/KakaoOauthService.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/kakao/KakaoOauthService.java index 898a69a..531882f 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/kakao/KakaoOauthService.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/kakao/KakaoOauthService.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.member.auth.oauth.kakao; +package com.pyonsnalcolor.auth.oauth.kakao; -import com.pyonsnalcolor.member.auth.dto.LoginRequestDto; -import com.pyonsnalcolor.member.auth.oauth.kakao.dto.KakaoUserInfoDto; +import com.pyonsnalcolor.auth.dto.LoginRequestDto; +import com.pyonsnalcolor.auth.oauth.kakao.dto.KakaoUserInfoDto; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/kakao/dto/KakaoOauthTokenDto.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/kakao/dto/KakaoOauthTokenDto.java similarity index 89% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/kakao/dto/KakaoOauthTokenDto.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/kakao/dto/KakaoOauthTokenDto.java index e7313b3..53efeaf 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/kakao/dto/KakaoOauthTokenDto.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/kakao/dto/KakaoOauthTokenDto.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.member.auth.oauth.kakao.dto; +package com.pyonsnalcolor.auth.oauth.kakao.dto; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/kakao/dto/KakaoUserInfoDto.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/kakao/dto/KakaoUserInfoDto.java similarity index 88% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/kakao/dto/KakaoUserInfoDto.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/kakao/dto/KakaoUserInfoDto.java index 52df6f9..b8f43cb 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/oauth/kakao/dto/KakaoUserInfoDto.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/oauth/kakao/dto/KakaoUserInfoDto.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.member.auth.oauth.kakao.dto; +package com.pyonsnalcolor.auth.oauth.kakao.dto; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/service/MemberService.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/service/MemberService.java similarity index 86% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/service/MemberService.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/service/MemberService.java index 4e0cebc..22e770a 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/auth/service/MemberService.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/auth/service/MemberService.java @@ -1,16 +1,16 @@ -package com.pyonsnalcolor.member.auth.service; - -import com.pyonsnalcolor.domain.member.Member; -import com.pyonsnalcolor.domain.member.enumtype.Nickname; -import com.pyonsnalcolor.domain.member.enumtype.OAuthType; -import com.pyonsnalcolor.domain.member.enumtype.Role; -import com.pyonsnalcolor.member.auth.RedisUtil; -import com.pyonsnalcolor.member.auth.dto.MemberInfoResponseDto; -import com.pyonsnalcolor.member.auth.dto.NicknameRequestDto; -import com.pyonsnalcolor.member.auth.dto.TokenDto; -import com.pyonsnalcolor.member.auth.CustomUserDetails; -import com.pyonsnalcolor.member.auth.jwt.JwtTokenProvider; -import com.pyonsnalcolor.domain.member.MemberRepository; +package com.pyonsnalcolor.auth.service; + +import com.pyonsnalcolor.member.Member; +import com.pyonsnalcolor.member.enumtype.Nickname; +import com.pyonsnalcolor.member.enumtype.OAuthType; +import com.pyonsnalcolor.member.enumtype.Role; +import com.pyonsnalcolor.auth.RedisUtil; +import com.pyonsnalcolor.auth.dto.MemberInfoResponseDto; +import com.pyonsnalcolor.auth.dto.NicknameRequestDto; +import com.pyonsnalcolor.auth.dto.TokenDto; +import com.pyonsnalcolor.auth.CustomUserDetails; +import com.pyonsnalcolor.auth.jwt.JwtTokenProvider; +import com.pyonsnalcolor.member.MemberRepository; import io.jsonwebtoken.JwtException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/config/RedisConfig.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/config/RedisConfig.java similarity index 96% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/config/RedisConfig.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/config/RedisConfig.java index 7758802..ad040fd 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/config/RedisConfig.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.member.config; +package com.pyonsnalcolor.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/config/SecurityConfig.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/config/SecurityConfig.java similarity index 89% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/config/SecurityConfig.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/config/SecurityConfig.java index 42691da..bfcc8cb 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/config/SecurityConfig.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/config/SecurityConfig.java @@ -1,9 +1,9 @@ -package com.pyonsnalcolor.member.config; +package com.pyonsnalcolor.config; -import com.pyonsnalcolor.member.auth.CustomUserDetailsService; -import com.pyonsnalcolor.member.auth.jwt.JwtAuthenticationFilter; -import com.pyonsnalcolor.member.handler.CustomAccessDeniedHandler; -import com.pyonsnalcolor.member.handler.CustomAuthenticationEntryPoint; +import com.pyonsnalcolor.auth.CustomUserDetailsService; +import com.pyonsnalcolor.auth.jwt.JwtAuthenticationFilter; +import com.pyonsnalcolor.handler.CustomAccessDeniedHandler; +import com.pyonsnalcolor.handler.CustomAuthenticationEntryPoint; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.context.annotation.Bean; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/handler/CustomAccessDeniedHandler.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/handler/CustomAccessDeniedHandler.java similarity index 94% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/handler/CustomAccessDeniedHandler.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/handler/CustomAccessDeniedHandler.java index 6b25e79..8af4212 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/handler/CustomAccessDeniedHandler.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/handler/CustomAccessDeniedHandler.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.member.handler; +package com.pyonsnalcolor.handler; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/handler/CustomAuthenticationEntryPoint.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/handler/CustomAuthenticationEntryPoint.java similarity index 94% rename from pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/handler/CustomAuthenticationEntryPoint.java rename to pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/handler/CustomAuthenticationEntryPoint.java index 2e3fee3..1c4b99c 100644 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/handler/CustomAuthenticationEntryPoint.java +++ b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/handler/CustomAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.member.handler; +package com.pyonsnalcolor.handler; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/MemberApplication.java b/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/MemberApplication.java deleted file mode 100644 index 8ff107e..0000000 --- a/pyonsnalcolor-member/src/main/java/com/pyonsnalcolor/member/MemberApplication.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.pyonsnalcolor.member; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; - -@EntityScan(basePackages = {"com.pyonsnalcolor.domain"}) -@EnableJpaRepositories(basePackages = {"com.pyonsnalcolor.domain"}) -@SpringBootApplication -public class MemberApplication { - - public static void main(String[] args) { - SpringApplication.run(MemberApplication.class, args); - } - -} diff --git a/pyonsnalcolor-member/src/main/resources/application-oauth.yml b/pyonsnalcolor-member/src/main/resources/application-oauth.yml index cb0a9dd..9c3664c 100644 --- a/pyonsnalcolor-member/src/main/resources/application-oauth.yml +++ b/pyonsnalcolor-member/src/main/resources/application-oauth.yml @@ -2,8 +2,8 @@ spring: security: oauth2: kakao: - request-uri: ${KAKAO_REQUEST_URI} + request-uri: https://kapi.kakao.com/v2/user/me apple: - key-uri: ${APPLE_KEY_URI} - issuer: ${APPLE_ISSUER} + key-uri: https://appleid.apple.com/auth/keys + issuer: https://appleid.apple.com client-id: ${APPLE_CLIENT_ID} \ No newline at end of file diff --git a/pyonsnalcolor-member/src/main/resources/application.yml b/pyonsnalcolor-member/src/main/resources/application.yml index 2425223..858a654 100644 --- a/pyonsnalcolor-member/src/main/resources/application.yml +++ b/pyonsnalcolor-member/src/main/resources/application.yml @@ -34,10 +34,10 @@ jwt: issuer: ${JWT_ISSUER} secret: ${JWT_SECRET} bearer: - header: ${JWT_BEARER_HEADER} + header: "Bearer " access-token: - header: ${JWT_ACCESS_TOKEN_HEADER} + header: Authorization validity: ${JWT_ACCESS_TOKEN_VALIDITY} refresh-token: - header: ${JWT_REFRESH_TOKEN_HEADER} + header: Refresh validity: ${JWT_REFRESH_TOKEN_VALIDITY} diff --git a/pyonsnalcolor-member/src/test/java/com/pyonsnalcolor/member/auth/service/MemberServiceTest.java b/pyonsnalcolor-member/src/test/java/com/pyonsnalcolor/auth/service/MemberServiceTest.java similarity index 89% rename from pyonsnalcolor-member/src/test/java/com/pyonsnalcolor/member/auth/service/MemberServiceTest.java rename to pyonsnalcolor-member/src/test/java/com/pyonsnalcolor/auth/service/MemberServiceTest.java index 2631d70..8ea390d 100644 --- a/pyonsnalcolor-member/src/test/java/com/pyonsnalcolor/member/auth/service/MemberServiceTest.java +++ b/pyonsnalcolor-member/src/test/java/com/pyonsnalcolor/auth/service/MemberServiceTest.java @@ -1,13 +1,13 @@ -package com.pyonsnalcolor.member.auth.service; - -import com.pyonsnalcolor.domain.member.Member; -import com.pyonsnalcolor.domain.member.MemberRepository; -import com.pyonsnalcolor.domain.member.enumtype.OAuthType; -import com.pyonsnalcolor.domain.member.enumtype.Role; -import com.pyonsnalcolor.member.auth.dto.MemberInfoResponseDto; -import com.pyonsnalcolor.member.auth.dto.NicknameRequestDto; -import com.pyonsnalcolor.member.auth.dto.TokenDto; -import com.pyonsnalcolor.member.auth.CustomUserDetails; +package com.pyonsnalcolor.auth.service; + +import com.pyonsnalcolor.member.Member; +import com.pyonsnalcolor.member.MemberRepository; +import com.pyonsnalcolor.member.enumtype.OAuthType; +import com.pyonsnalcolor.member.enumtype.Role; +import com.pyonsnalcolor.auth.dto.MemberInfoResponseDto; +import com.pyonsnalcolor.auth.dto.NicknameRequestDto; +import com.pyonsnalcolor.auth.dto.TokenDto; +import com.pyonsnalcolor.auth.CustomUserDetails; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/pyonsnalcolor-product/.mvn/wrapper/maven-wrapper.jar b/pyonsnalcolor-product/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index bf82ff0..0000000 Binary files a/pyonsnalcolor-product/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/pyonsnalcolor-product/.mvn/wrapper/maven-wrapper.properties b/pyonsnalcolor-product/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index ca5ab4b..0000000 --- a/pyonsnalcolor-product/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/pyonsnalcolor-product/HELP.md b/pyonsnalcolor-product/HELP.md deleted file mode 100644 index 16b0b13..0000000 --- a/pyonsnalcolor-product/HELP.md +++ /dev/null @@ -1,31 +0,0 @@ -# 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.7.12/maven-plugin/reference/html/) -* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.7.12/maven-plugin/reference/html/#build-image) -* [Spring Batch](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#howto.batch) -* [Spring Web](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#web) -* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#data.sql.jpa-and-spring-data) -* [Spring Data MongoDB](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#data.nosql.mongodb) -* [Spring Boot DevTools](https://docs.spring.io/spring-boot/docs/2.7.12/reference/htmlsingle/#using.devtools) -* [OpenFeign](https://docs.spring.io/spring-cloud-openfeign/docs/current/reference/html/) - -### Guides -The following guides illustrate how to use some features concretely: - -* [Creating a Batch Service](https://spring.io/guides/gs/batch-processing/) -* [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/rest/) -* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) -* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) -* [Accessing Data with MongoDB](https://spring.io/guides/gs/accessing-data-mongodb/) - -### Additional Links -These additional references should also help you: - -* [Declarative REST calls with Spring Cloud OpenFeign sample](https://github.com/spring-cloud-samples/feign-eureka) - diff --git a/pyonsnalcolor-product/build.gradle b/pyonsnalcolor-product/build.gradle new file mode 100644 index 0000000..f3831be --- /dev/null +++ b/pyonsnalcolor-product/build.gradle @@ -0,0 +1,19 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'com.pyonsnalcolor.java-conventions' +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-batch:2.7.12' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa:2.7.12' + implementation 'org.springframework.boot:spring-boot-starter-data-mongodb:2.7.12' + implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:3.1.7' + runtimeOnly 'com.h2database:h2:2.1.214' + runtimeOnly 'com.mysql:mysql-connector-j:8.0.33' + testImplementation 'org.springframework.batch:spring-batch-test:4.3.8' +} + +description = 'pyonsnalcolor-product' diff --git a/pyonsnalcolor-product/build/resources/main/application.properties b/pyonsnalcolor-product/build/resources/main/application.properties new file mode 100644 index 0000000..e1d3e79 --- /dev/null +++ b/pyonsnalcolor-product/build/resources/main/application.properties @@ -0,0 +1 @@ +spring.data.mongodb.uri=mongodb://localhost:27017/pyonsnal diff --git a/pyonsnalcolor-product/mvnw b/pyonsnalcolor-product/mvnw deleted file mode 100644 index 8a8fb22..0000000 --- a/pyonsnalcolor-product/mvnw +++ /dev/null @@ -1,316 +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 /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - 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="`\\unset -f command; \\command -v 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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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" || rm -f "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$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 \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/pyonsnalcolor-product/mvnw.cmd b/pyonsnalcolor-product/mvnw.cmd deleted file mode 100644 index 1d8ab01..0000000 --- a/pyonsnalcolor-product/mvnw.cmd +++ /dev/null @@ -1,188 +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 "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" - -FOR /F "usebackq 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%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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 "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\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% - -cmd /C exit /B %ERROR_CODE% diff --git a/pyonsnalcolor-product/pom.xml b/pyonsnalcolor-product/pom.xml deleted file mode 100644 index 21c452c..0000000 --- a/pyonsnalcolor-product/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - 4.0.0 - - pyonsnalcolor - com.pyonsnalcolor - 1.0-SNAPSHOT - - com.pyonsnalcolor - pyonsnalcolor-product - 1.0-SNAPSHOT - pyonsnalcolor-product - Demo project for Spring Boot - - 11 - 2021.0.7 - - - - org.springframework.boot - spring-boot-starter-batch - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-data-mongodb - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - com.h2database - h2 - runtime - - - com.mysql - mysql-connector-j - runtime - - - - - org.springframework.batch - spring-batch-test - test - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.projectlombok - lombok - - - - - - - - diff --git a/pyonsnalcolor-product/pyonsnalcolor-product.iml b/pyonsnalcolor-product/pyonsnalcolor-product.iml deleted file mode 100644 index 0c9d1e8..0000000 --- a/pyonsnalcolor-product/pyonsnalcolor-product.iml +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/ProductApplication.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/ProductApplication.java similarity index 91% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/ProductApplication.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/ProductApplication.java index 22e107a..0c05660 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/ProductApplication.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/ProductApplication.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.product; +package com.pyonsnalcolor; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/controller/EventProductController.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/controller/EventProductController.java similarity index 89% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/controller/EventProductController.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/controller/EventProductController.java index a61ef20..2a0da63 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/controller/EventProductController.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/controller/EventProductController.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.product.controller; +package com.pyonsnalcolor.controller; -import com.pyonsnalcolor.product.model.BaseEventProduct; -import com.pyonsnalcolor.product.service.EventProductService; +import com.pyonsnalcolor.model.BaseEventProduct; +import com.pyonsnalcolor.service.EventProductService; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.web.bind.annotation.GetMapping; diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/controller/PbProductController.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/controller/PbProductController.java similarity index 88% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/controller/PbProductController.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/controller/PbProductController.java index 48f5129..59b5635 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/controller/PbProductController.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/controller/PbProductController.java @@ -1,8 +1,8 @@ -package com.pyonsnalcolor.product.controller; +package com.pyonsnalcolor.controller; -import com.pyonsnalcolor.product.model.BasePbProduct; -import com.pyonsnalcolor.product.service.PbProductService; +import com.pyonsnalcolor.model.BasePbProduct; +import com.pyonsnalcolor.service.PbProductService; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.web.bind.annotation.GetMapping; diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/BaseEventProduct.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/BaseEventProduct.java similarity index 91% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/BaseEventProduct.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/BaseEventProduct.java index f203c93..d918828 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/BaseEventProduct.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/BaseEventProduct.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.product.model; +package com.pyonsnalcolor.model; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/BasePbProduct.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/BasePbProduct.java similarity index 89% rename from pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/BasePbProduct.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/BasePbProduct.java index 065a47c..d93e93f 100644 --- a/pyonsnalcolor-domain/src/main/java/com/pyonsnalcolor/domain/product/BasePbProduct.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/BasePbProduct.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.domain.product; +package com.pyonsnalcolor.model; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/BaseProduct.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/BaseProduct.java similarity index 93% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/BaseProduct.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/BaseProduct.java index ba31f0e..9ca2805 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/BaseProduct.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/BaseProduct.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.product.model; +package com.pyonsnalcolor.model; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/EventType.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/EventType.java similarity index 92% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/EventType.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/EventType.java index 8808afc..c0b8d24 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/EventType.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/EventType.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.product.model; +package com.pyonsnalcolor.model; import lombok.Getter; diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/StoreType.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/StoreType.java similarity index 69% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/StoreType.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/StoreType.java index e4750e6..b247cdf 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/model/StoreType.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/model/StoreType.java @@ -1,4 +1,4 @@ -package com.pyonsnalcolor.product.model; +package com.pyonsnalcolor.model; import lombok.Getter; diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/repository/BasicProductRepository.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/repository/BasicProductRepository.java similarity index 80% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/repository/BasicProductRepository.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/repository/BasicProductRepository.java index 94600b8..8cdfb62 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/repository/BasicProductRepository.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/repository/BasicProductRepository.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.product.repository; +package com.pyonsnalcolor.repository; -import com.pyonsnalcolor.product.model.StoreType; +import com.pyonsnalcolor.model.StoreType; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.mongodb.repository.MongoRepository; diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/repository/EventProductRepository.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/repository/EventProductRepository.java similarity index 61% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/repository/EventProductRepository.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/repository/EventProductRepository.java index 75ccd27..fed25e5 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/repository/EventProductRepository.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/repository/EventProductRepository.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.product.repository; +package com.pyonsnalcolor.repository; -import com.pyonsnalcolor.product.model.BaseEventProduct; +import com.pyonsnalcolor.model.BaseEventProduct; import org.springframework.stereotype.Repository; @Repository diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/repository/PbProductRepository.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/repository/PbProductRepository.java similarity index 61% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/repository/PbProductRepository.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/repository/PbProductRepository.java index c08144e..3989b96 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/repository/PbProductRepository.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/repository/PbProductRepository.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.product.repository; +package com.pyonsnalcolor.repository; -import com.pyonsnalcolor.product.model.BasePbProduct; +import com.pyonsnalcolor.model.BasePbProduct; import org.springframework.stereotype.Repository; @Repository diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/service/EventProductService.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/service/EventProductService.java similarity index 60% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/service/EventProductService.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/service/EventProductService.java index 4706780..1715e4a 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/service/EventProductService.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/service/EventProductService.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.product.service; +package com.pyonsnalcolor.service; -import com.pyonsnalcolor.product.model.BaseEventProduct; -import com.pyonsnalcolor.product.repository.EventProductRepository; +import com.pyonsnalcolor.model.BaseEventProduct; +import com.pyonsnalcolor.repository.EventProductRepository; import org.springframework.stereotype.Service; @Service diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/service/PbProductService.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/service/PbProductService.java similarity index 59% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/service/PbProductService.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/service/PbProductService.java index 1ab5011..1df795a 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/service/PbProductService.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/service/PbProductService.java @@ -1,7 +1,7 @@ -package com.pyonsnalcolor.product.service; +package com.pyonsnalcolor.service; -import com.pyonsnalcolor.product.model.BasePbProduct; -import com.pyonsnalcolor.product.repository.PbProductRepository; +import com.pyonsnalcolor.model.BasePbProduct; +import com.pyonsnalcolor.repository.PbProductRepository; import org.springframework.stereotype.Service; @Service diff --git a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/service/ProductService.java b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/service/ProductService.java similarity index 81% rename from pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/service/ProductService.java rename to pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/service/ProductService.java index eded1fa..dc607c0 100644 --- a/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/product/service/ProductService.java +++ b/pyonsnalcolor-product/src/main/java/com/pyonsnalcolor/service/ProductService.java @@ -1,8 +1,8 @@ -package com.pyonsnalcolor.product.service; +package com.pyonsnalcolor.service; -import com.pyonsnalcolor.product.model.BaseProduct; -import com.pyonsnalcolor.product.model.StoreType; -import com.pyonsnalcolor.product.repository.BasicProductRepository; +import com.pyonsnalcolor.model.BaseProduct; +import com.pyonsnalcolor.model.StoreType; +import com.pyonsnalcolor.repository.BasicProductRepository; import lombok.AllArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/pyonsnalcolor-product/target/classes/application.properties b/pyonsnalcolor-product/target/classes/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/pyonsnalcolor-product/target/classes/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/pyonsnalcolor.iml b/pyonsnalcolor.iml deleted file mode 100644 index 17ceadd..0000000 --- a/pyonsnalcolor.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..cc4f3db --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'pyonsnalcolor' +include(':pyonsnalcolor-domain') +include(':pyonsnalcolor-batch') +include(':pyonsnalcolor-member') +include(':pyonsnalcolor-product') +include(':pyonsnalcolor-alarm')