diff --git a/learningFlow/.gitattributes b/.gitattributes similarity index 100% rename from learningFlow/.gitattributes rename to .gitattributes diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bcd5604..51683c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,8 +29,8 @@ jobs: - name: Build and push uses: docker/build-push-action@v4 with: - context: . - file: ./Dockerfile + context: . # Dockerfile이 있는 디렉토리 + file: ./Dockerfile # Dockerfile 경로 지정 push: true tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPONAME }} @@ -39,18 +39,24 @@ jobs: needs: [docker] steps: - # SSH Connect and Docker Image Pull and Container Run - - name: SSH Connect and Docker Image Pull and Container Run - uses: appleboy/ssh-action@v1.0.0 + - name: Deploy to Server + uses: appleboy/ssh-action@master with: host: ${{ secrets.EC2_HOST }} username: ${{ secrets.EC2_USER }} key: ${{ secrets.EC2_SSH_KEY }} - port: 22 + envs: GITHUB_SHA script: | - docker stop my-was || true - docker rm my-was || true - docker image rm ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPONAME }} || true - docker run -d -p 8080:8080 \ - -v /root/my-proj/resources:/app/resources \ - --name my-was ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPONAME }} + sudo docker ps -qa | xargs -r sudo docker rm -f + sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPONAME }}:latest + sudo docker run -d -p 8080:8080 \ + -e MAIL_PASSWORD=${{ secrets.MAIL_PASSWORD }} \ + -e MAIL_USERNAME=${{ secrets.MAIL_USERNAME }} \ + -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_ID=${{ secrets.SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_ID }} \ + -e SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_SECRET=${{ secrets.SPRING_SECURITY_OAUTH2_CLIENT_REGISTRATION_GOOGLE_CLIENT_SECRET }} \ + -e JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }} \ + -e DB_URL=${{ secrets.DB_URL }} \ + -e DB_USER=${{ secrets.DB_USER }} \ + -e DB_PASSWORD=${{ secrets.DB_PASSWORD }} \ + ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPONAME }}:latest + sudo docker image prune -f diff --git a/.gitignore b/.gitignore index d50b366..f6412ab 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,7 @@ bin/ ### IntelliJ IDEA ### .idea -#../.idea +../.idea *.iws *.iml @@ -43,3 +43,6 @@ out/ ### gradle ### .gradle/ + +### 환경변수 ### +.env diff --git a/learningFlow/Dockerfile b/Dockerfile similarity index 100% rename from learningFlow/Dockerfile rename to Dockerfile diff --git a/learningFlow/build.gradle b/build.gradle similarity index 100% rename from learningFlow/build.gradle rename to build.gradle diff --git a/learningFlow/docker-compose.yml b/docker-compose.yml similarity index 100% rename from learningFlow/docker-compose.yml rename to docker-compose.yml diff --git a/learningFlow/erd.md b/erd.md similarity index 100% rename from learningFlow/erd.md rename to erd.md diff --git a/learningFlow/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from learningFlow/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/learningFlow/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from learningFlow/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/learningFlow/gradlew b/gradlew similarity index 100% rename from learningFlow/gradlew rename to gradlew diff --git a/learningFlow/gradlew.bat b/gradlew.bat similarity index 100% rename from learningFlow/gradlew.bat rename to gradlew.bat diff --git a/learningFlow/.idea/compiler.xml b/learningFlow/.idea/compiler.xml deleted file mode 100644 index cb931fb..0000000 --- a/learningFlow/.idea/compiler.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/learningFlow/settings.gradle b/settings.gradle similarity index 100% rename from learningFlow/settings.gradle rename to settings.gradle diff --git a/learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QBaseEntity.java b/src/main/generated/learningFlow/learningFlow_BE/domain/QBaseEntity.java similarity index 100% rename from learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QBaseEntity.java rename to src/main/generated/learningFlow/learningFlow_BE/domain/QBaseEntity.java diff --git a/learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QCollection.java b/src/main/generated/learningFlow/learningFlow_BE/domain/QCollection.java similarity index 100% rename from learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QCollection.java rename to src/main/generated/learningFlow/learningFlow_BE/domain/QCollection.java diff --git a/learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QCollectionEpisode.java b/src/main/generated/learningFlow/learningFlow_BE/domain/QCollectionEpisode.java similarity index 100% rename from learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QCollectionEpisode.java rename to src/main/generated/learningFlow/learningFlow_BE/domain/QCollectionEpisode.java diff --git a/learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QEmailVerificationToken.java b/src/main/generated/learningFlow/learningFlow_BE/domain/QEmailVerificationToken.java similarity index 100% rename from learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QEmailVerificationToken.java rename to src/main/generated/learningFlow/learningFlow_BE/domain/QEmailVerificationToken.java diff --git a/learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QImage.java b/src/main/generated/learningFlow/learningFlow_BE/domain/QImage.java similarity index 100% rename from learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QImage.java rename to src/main/generated/learningFlow/learningFlow_BE/domain/QImage.java diff --git a/learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QMemo.java b/src/main/generated/learningFlow/learningFlow_BE/domain/QMemo.java similarity index 100% rename from learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QMemo.java rename to src/main/generated/learningFlow/learningFlow_BE/domain/QMemo.java diff --git a/learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QMemoId.java b/src/main/generated/learningFlow/learningFlow_BE/domain/QMemoId.java similarity index 100% rename from learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QMemoId.java rename to src/main/generated/learningFlow/learningFlow_BE/domain/QMemoId.java diff --git a/learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QPasswordResetToken.java b/src/main/generated/learningFlow/learningFlow_BE/domain/QPasswordResetToken.java similarity index 100% rename from learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QPasswordResetToken.java rename to src/main/generated/learningFlow/learningFlow_BE/domain/QPasswordResetToken.java diff --git a/learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QResource.java b/src/main/generated/learningFlow/learningFlow_BE/domain/QResource.java similarity index 100% rename from learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QResource.java rename to src/main/generated/learningFlow/learningFlow_BE/domain/QResource.java diff --git a/learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QUser.java b/src/main/generated/learningFlow/learningFlow_BE/domain/QUser.java similarity index 100% rename from learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QUser.java rename to src/main/generated/learningFlow/learningFlow_BE/domain/QUser.java diff --git a/learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QUserCollection.java b/src/main/generated/learningFlow/learningFlow_BE/domain/QUserCollection.java similarity index 100% rename from learningFlow/src/main/generated/learningFlow/learningFlow_BE/domain/QUserCollection.java rename to src/main/generated/learningFlow/learningFlow_BE/domain/QUserCollection.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/LearningFlowBeApplication.java b/src/main/java/learningFlow/learningFlow_BE/LearningFlowBeApplication.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/LearningFlowBeApplication.java rename to src/main/java/learningFlow/learningFlow_BE/LearningFlowBeApplication.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/ApiResponse.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/ApiResponse.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/ApiResponse.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/ApiResponse.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/BaseCode.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/BaseCode.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/BaseCode.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/code/BaseCode.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/BaseErrorCode.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/BaseErrorCode.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/BaseErrorCode.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/code/BaseErrorCode.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/ErrorReasonDTO.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/ErrorReasonDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/ErrorReasonDTO.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/code/ErrorReasonDTO.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/ReasonDTO.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/ReasonDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/ReasonDTO.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/code/ReasonDTO.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/ErrorStatus.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/ErrorStatus.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/ErrorStatus.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/ErrorStatus.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/SuccessStatus.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/SuccessStatus.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/SuccessStatus.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/code/status/SuccessStatus.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/ExceptionAdvice.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/ExceptionAdvice.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/ExceptionAdvice.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/ExceptionAdvice.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/GeneralException.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/GeneralException.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/GeneralException.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/GeneralException.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/CollectionHandler.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/CollectionHandler.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/CollectionHandler.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/CollectionHandler.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/LoginHandler.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/LoginHandler.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/LoginHandler.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/LoginHandler.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/PageHandler.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/PageHandler.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/PageHandler.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/PageHandler.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/ResourceHandler.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/ResourceHandler.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/ResourceHandler.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/ResourceHandler.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/UserHandler.java b/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/UserHandler.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/UserHandler.java rename to src/main/java/learningFlow/learningFlow_BE/apiPayload/exception/handler/UserHandler.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/config/QueryDslConfig.java b/src/main/java/learningFlow/learningFlow_BE/config/QueryDslConfig.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/config/QueryDslConfig.java rename to src/main/java/learningFlow/learningFlow_BE/config/QueryDslConfig.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/config/SwaggerConfig.java b/src/main/java/learningFlow/learningFlow_BE/config/SwaggerConfig.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/config/SwaggerConfig.java rename to src/main/java/learningFlow/learningFlow_BE/config/SwaggerConfig.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/config/redis/RedisConfig.java b/src/main/java/learningFlow/learningFlow_BE/config/redis/RedisConfig.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/config/redis/RedisConfig.java rename to src/main/java/learningFlow/learningFlow_BE/config/redis/RedisConfig.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/config/security/JwtConfig.java b/src/main/java/learningFlow/learningFlow_BE/config/security/JwtConfig.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/config/security/JwtConfig.java rename to src/main/java/learningFlow/learningFlow_BE/config/security/JwtConfig.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/config/security/SecurityConfig.java b/src/main/java/learningFlow/learningFlow_BE/config/security/SecurityConfig.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/config/security/SecurityConfig.java rename to src/main/java/learningFlow/learningFlow_BE/config/security/SecurityConfig.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/converter/CollectionConverter.java b/src/main/java/learningFlow/learningFlow_BE/converter/CollectionConverter.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/converter/CollectionConverter.java rename to src/main/java/learningFlow/learningFlow_BE/converter/CollectionConverter.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/converter/MemoConverter.java b/src/main/java/learningFlow/learningFlow_BE/converter/MemoConverter.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/converter/MemoConverter.java rename to src/main/java/learningFlow/learningFlow_BE/converter/MemoConverter.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/converter/UserConverter.java b/src/main/java/learningFlow/learningFlow_BE/converter/UserConverter.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/converter/UserConverter.java rename to src/main/java/learningFlow/learningFlow_BE/converter/UserConverter.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/BaseEntity.java b/src/main/java/learningFlow/learningFlow_BE/domain/BaseEntity.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/BaseEntity.java rename to src/main/java/learningFlow/learningFlow_BE/domain/BaseEntity.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/Collection.java b/src/main/java/learningFlow/learningFlow_BE/domain/Collection.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/Collection.java rename to src/main/java/learningFlow/learningFlow_BE/domain/Collection.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/CollectionEpisode.java b/src/main/java/learningFlow/learningFlow_BE/domain/CollectionEpisode.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/CollectionEpisode.java rename to src/main/java/learningFlow/learningFlow_BE/domain/CollectionEpisode.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/EmailVerificationToken.java b/src/main/java/learningFlow/learningFlow_BE/domain/EmailVerificationToken.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/EmailVerificationToken.java rename to src/main/java/learningFlow/learningFlow_BE/domain/EmailVerificationToken.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/Image.java b/src/main/java/learningFlow/learningFlow_BE/domain/Image.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/Image.java rename to src/main/java/learningFlow/learningFlow_BE/domain/Image.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/Memo.java b/src/main/java/learningFlow/learningFlow_BE/domain/Memo.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/Memo.java rename to src/main/java/learningFlow/learningFlow_BE/domain/Memo.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/MemoId.java b/src/main/java/learningFlow/learningFlow_BE/domain/MemoId.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/MemoId.java rename to src/main/java/learningFlow/learningFlow_BE/domain/MemoId.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/PasswordResetToken.java b/src/main/java/learningFlow/learningFlow_BE/domain/PasswordResetToken.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/PasswordResetToken.java rename to src/main/java/learningFlow/learningFlow_BE/domain/PasswordResetToken.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/Resource.java b/src/main/java/learningFlow/learningFlow_BE/domain/Resource.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/Resource.java rename to src/main/java/learningFlow/learningFlow_BE/domain/Resource.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/User.java b/src/main/java/learningFlow/learningFlow_BE/domain/User.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/User.java rename to src/main/java/learningFlow/learningFlow_BE/domain/User.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/UserCollection.java b/src/main/java/learningFlow/learningFlow_BE/domain/UserCollection.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/UserCollection.java rename to src/main/java/learningFlow/learningFlow_BE/domain/UserCollection.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/Gender.java b/src/main/java/learningFlow/learningFlow_BE/domain/enums/Gender.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/Gender.java rename to src/main/java/learningFlow/learningFlow_BE/domain/enums/Gender.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/InterestField.java b/src/main/java/learningFlow/learningFlow_BE/domain/enums/InterestField.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/InterestField.java rename to src/main/java/learningFlow/learningFlow_BE/domain/enums/InterestField.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/Job.java b/src/main/java/learningFlow/learningFlow_BE/domain/enums/Job.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/Job.java rename to src/main/java/learningFlow/learningFlow_BE/domain/enums/Job.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/MediaType.java b/src/main/java/learningFlow/learningFlow_BE/domain/enums/MediaType.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/MediaType.java rename to src/main/java/learningFlow/learningFlow_BE/domain/enums/MediaType.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/ResourceType.java b/src/main/java/learningFlow/learningFlow_BE/domain/enums/ResourceType.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/ResourceType.java rename to src/main/java/learningFlow/learningFlow_BE/domain/enums/ResourceType.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/Role.java b/src/main/java/learningFlow/learningFlow_BE/domain/enums/Role.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/Role.java rename to src/main/java/learningFlow/learningFlow_BE/domain/enums/Role.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/SocialType.java b/src/main/java/learningFlow/learningFlow_BE/domain/enums/SocialType.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/domain/enums/SocialType.java rename to src/main/java/learningFlow/learningFlow_BE/domain/enums/SocialType.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/EmailVerificationTokenRepository.java b/src/main/java/learningFlow/learningFlow_BE/repository/EmailVerificationTokenRepository.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/EmailVerificationTokenRepository.java rename to src/main/java/learningFlow/learningFlow_BE/repository/EmailVerificationTokenRepository.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/ImageRepository.java b/src/main/java/learningFlow/learningFlow_BE/repository/ImageRepository.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/ImageRepository.java rename to src/main/java/learningFlow/learningFlow_BE/repository/ImageRepository.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/MemoRepository.java b/src/main/java/learningFlow/learningFlow_BE/repository/MemoRepository.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/MemoRepository.java rename to src/main/java/learningFlow/learningFlow_BE/repository/MemoRepository.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/PasswordResetTokenRepository.java b/src/main/java/learningFlow/learningFlow_BE/repository/PasswordResetTokenRepository.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/PasswordResetTokenRepository.java rename to src/main/java/learningFlow/learningFlow_BE/repository/PasswordResetTokenRepository.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/UserRepository.java b/src/main/java/learningFlow/learningFlow_BE/repository/UserRepository.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/UserRepository.java rename to src/main/java/learningFlow/learningFlow_BE/repository/UserRepository.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/collection/CollectionRepository.java b/src/main/java/learningFlow/learningFlow_BE/repository/collection/CollectionRepository.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/collection/CollectionRepository.java rename to src/main/java/learningFlow/learningFlow_BE/repository/collection/CollectionRepository.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/collection/CollectionRepositoryCustom.java b/src/main/java/learningFlow/learningFlow_BE/repository/collection/CollectionRepositoryCustom.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/collection/CollectionRepositoryCustom.java rename to src/main/java/learningFlow/learningFlow_BE/repository/collection/CollectionRepositoryCustom.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/collection/CollectionRepositoryImpl.java b/src/main/java/learningFlow/learningFlow_BE/repository/collection/CollectionRepositoryImpl.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/repository/collection/CollectionRepositoryImpl.java rename to src/main/java/learningFlow/learningFlow_BE/repository/collection/CollectionRepositoryImpl.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/security/auth/PrincipalDetails.java b/src/main/java/learningFlow/learningFlow_BE/security/auth/PrincipalDetails.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/security/auth/PrincipalDetails.java rename to src/main/java/learningFlow/learningFlow_BE/security/auth/PrincipalDetails.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/security/handler/CustomAuthenticationEntryPoint.java b/src/main/java/learningFlow/learningFlow_BE/security/handler/CustomAuthenticationEntryPoint.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/security/handler/CustomAuthenticationEntryPoint.java rename to src/main/java/learningFlow/learningFlow_BE/security/handler/CustomAuthenticationEntryPoint.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/security/handler/JwtLogoutHandler.java b/src/main/java/learningFlow/learningFlow_BE/security/handler/JwtLogoutHandler.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/security/handler/JwtLogoutHandler.java rename to src/main/java/learningFlow/learningFlow_BE/security/handler/JwtLogoutHandler.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/security/handler/OAuth2LoginSuccessHandler.java b/src/main/java/learningFlow/learningFlow_BE/security/handler/OAuth2LoginSuccessHandler.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/security/handler/OAuth2LoginSuccessHandler.java rename to src/main/java/learningFlow/learningFlow_BE/security/handler/OAuth2LoginSuccessHandler.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtAuthenticationFilter.java b/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtAuthenticationFilter.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtAuthenticationFilter.java rename to src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtAuthenticationFilter.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtProperties.java b/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtProperties.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtProperties.java rename to src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtProperties.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtTokenProvider.java b/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtTokenProvider.java similarity index 99% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtTokenProvider.java rename to src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtTokenProvider.java index e24e669..e677bd1 100644 --- a/learningFlow/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtTokenProvider.java +++ b/src/main/java/learningFlow/learningFlow_BE/security/jwt/JwtTokenProvider.java @@ -22,6 +22,8 @@ public class JwtTokenProvider { private final JwtProperties jwtProperties; private final SecretKey jwtSecretKey; + + public String createAccessToken(Authentication authentication) { PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal(); User user = principalDetails.getUser(); diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/service/auth/common/AuthTokenCleanupScheduler.java b/src/main/java/learningFlow/learningFlow_BE/service/auth/common/AuthTokenCleanupScheduler.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/service/auth/common/AuthTokenCleanupScheduler.java rename to src/main/java/learningFlow/learningFlow_BE/service/auth/common/AuthTokenCleanupScheduler.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/service/auth/common/UserVerificationEmailService.java b/src/main/java/learningFlow/learningFlow_BE/service/auth/common/UserVerificationEmailService.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/service/auth/common/UserVerificationEmailService.java rename to src/main/java/learningFlow/learningFlow_BE/service/auth/common/UserVerificationEmailService.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/service/auth/local/LocalUserAuthService.java b/src/main/java/learningFlow/learningFlow_BE/service/auth/local/LocalUserAuthService.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/service/auth/local/LocalUserAuthService.java rename to src/main/java/learningFlow/learningFlow_BE/service/auth/local/LocalUserAuthService.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserAuthenticationService.java b/src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserAuthenticationService.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserAuthenticationService.java rename to src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserAuthenticationService.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserRegistrationService.java b/src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserRegistrationService.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserRegistrationService.java rename to src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserRegistrationService.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserTemp.java b/src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserTemp.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserTemp.java rename to src/main/java/learningFlow/learningFlow_BE/service/auth/oauth/OAuth2UserTemp.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java b/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java rename to src/main/java/learningFlow/learningFlow_BE/service/collection/CollectionService.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/service/memo/MemoCommandService.java b/src/main/java/learningFlow/learningFlow_BE/service/memo/MemoCommandService.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/service/memo/MemoCommandService.java rename to src/main/java/learningFlow/learningFlow_BE/service/memo/MemoCommandService.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/service/memo/MemoCommandServiceImpl.java b/src/main/java/learningFlow/learningFlow_BE/service/memo/MemoCommandServiceImpl.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/service/memo/MemoCommandServiceImpl.java rename to src/main/java/learningFlow/learningFlow_BE/service/memo/MemoCommandServiceImpl.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/service/user/CustomUserDetailsService.java b/src/main/java/learningFlow/learningFlow_BE/service/user/CustomUserDetailsService.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/service/user/CustomUserDetailsService.java rename to src/main/java/learningFlow/learningFlow_BE/service/user/CustomUserDetailsService.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java b/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java rename to src/main/java/learningFlow/learningFlow_BE/service/user/UserService.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/validation/annotation/CheckPage.java b/src/main/java/learningFlow/learningFlow_BE/validation/annotation/CheckPage.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/validation/annotation/CheckPage.java rename to src/main/java/learningFlow/learningFlow_BE/validation/annotation/CheckPage.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/validation/validator/CheckPageArgumentResolver.java b/src/main/java/learningFlow/learningFlow_BE/validation/validator/CheckPageArgumentResolver.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/validation/validator/CheckPageArgumentResolver.java rename to src/main/java/learningFlow/learningFlow_BE/validation/validator/CheckPageArgumentResolver.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/controller/CollectionRestController.java b/src/main/java/learningFlow/learningFlow_BE/web/controller/CollectionRestController.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/controller/CollectionRestController.java rename to src/main/java/learningFlow/learningFlow_BE/web/controller/CollectionRestController.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/controller/HomeRestController.java b/src/main/java/learningFlow/learningFlow_BE/web/controller/HomeRestController.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/controller/HomeRestController.java rename to src/main/java/learningFlow/learningFlow_BE/web/controller/HomeRestController.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/controller/LoginController.java b/src/main/java/learningFlow/learningFlow_BE/web/controller/LoginController.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/controller/LoginController.java rename to src/main/java/learningFlow/learningFlow_BE/web/controller/LoginController.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/controller/ResourceRestController.java b/src/main/java/learningFlow/learningFlow_BE/web/controller/ResourceRestController.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/controller/ResourceRestController.java rename to src/main/java/learningFlow/learningFlow_BE/web/controller/ResourceRestController.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/controller/SearchRestController.java b/src/main/java/learningFlow/learningFlow_BE/web/controller/SearchRestController.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/controller/SearchRestController.java rename to src/main/java/learningFlow/learningFlow_BE/web/controller/SearchRestController.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/controller/UserRestController.java b/src/main/java/learningFlow/learningFlow_BE/web/controller/UserRestController.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/controller/UserRestController.java rename to src/main/java/learningFlow/learningFlow_BE/web/controller/UserRestController.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/TempRequest.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/TempRequest.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/TempRequest.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/TempRequest.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/TempResponse.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/TempResponse.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/TempResponse.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/TempResponse.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/bookmark/BookmarkDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/bookmark/BookmarkDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/bookmark/BookmarkDTO.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/bookmark/BookmarkDTO.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/collection/CollectionRequestDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/collection/CollectionRequestDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/collection/CollectionRequestDTO.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/collection/CollectionRequestDTO.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/collection/CollectionResponseDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/collection/CollectionResponseDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/collection/CollectionResponseDTO.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/collection/CollectionResponseDTO.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/home/HomeResponseDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/home/HomeResponseDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/home/HomeResponseDTO.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/home/HomeResponseDTO.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/memo/MemoRequestDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/memo/MemoRequestDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/memo/MemoRequestDTO.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/memo/MemoRequestDTO.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/memo/MemoResponseDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/memo/MemoResponseDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/memo/MemoResponseDTO.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/memo/MemoResponseDTO.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceRequestDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceRequestDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceRequestDTO.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceRequestDTO.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceResponseDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceResponseDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceResponseDTO.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/resource/ResourceResponseDTO.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/search/SearchRequestDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/search/SearchRequestDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/search/SearchRequestDTO.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/search/SearchRequestDTO.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/user/UserRequestDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/user/UserRequestDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/user/UserRequestDTO.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/user/UserRequestDTO.java diff --git a/learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/user/UserResponseDTO.java b/src/main/java/learningFlow/learningFlow_BE/web/dto/user/UserResponseDTO.java similarity index 100% rename from learningFlow/src/main/java/learningFlow/learningFlow_BE/web/dto/user/UserResponseDTO.java rename to src/main/java/learningFlow/learningFlow_BE/web/dto/user/UserResponseDTO.java diff --git a/learningFlow/src/main/resources/application.yml b/src/main/resources/application.yml similarity index 100% rename from learningFlow/src/main/resources/application.yml rename to src/main/resources/application.yml diff --git a/learningFlow/src/test/java/learningFlow/learningFlow_BE/LearningFlowBeApplicationTests.java b/src/test/java/learningFlow/learningFlow_BE/LearningFlowBeApplicationTests.java similarity index 100% rename from learningFlow/src/test/java/learningFlow/learningFlow_BE/LearningFlowBeApplicationTests.java rename to src/test/java/learningFlow/learningFlow_BE/LearningFlowBeApplicationTests.java